diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index 07e44b8..48b4e8c 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,8 +1,8 @@
-score ACCT_PHISHING_MANY                    2.999 2.996 2.999 2.996
+score ACCT_PHISHING_MANY                    2.996 2.996 2.996 2.996
 score AC_BR_BONANZA                         0.001 0.001 0.001 0.001
 score AC_DIV_BONANZA                        0.001 0.001 0.001 0.001
-score AC_FROM_MANY_DOTS                     2.999 2.996 2.999 2.996
-score AC_HTML_NONSENSE_TAGS                 1.899 1.997 1.899 1.997
+score AC_FROM_MANY_DOTS                     2.996 2.996 2.996 2.996
+score AC_HTML_NONSENSE_TAGS                 1.897 1.997 1.897 1.997
 score AC_POST_EXTRAS                        1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS1               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS10              1.000 1.000 1.000 1.000
@@ -13,286 +13,289 @@
 score AC_SPAMMY_URI_PATTERNS4               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS8               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS9               1.000 1.000 1.000 1.000
-score ADMITS_SPAM                           3.599 3.396 3.599 3.396
+score ADMITS_SPAM                           3.595 3.396 3.595 3.396
 score ADULT_DATING_COMPANY                  10.001 10.001 10.001 10.001
-score ADVANCE_FEE_2_NEW_FORM                1.569 1.361 1.569 1.361
-score ADVANCE_FEE_2_NEW_FRM_MNY             2.500 2.497 2.500 2.497
-score ADVANCE_FEE_2_NEW_MONEY               1.090 0.001 1.090 0.001
-score ADVANCE_FEE_3_NEW                     3.500 3.408 3.500 3.408
-score ADVANCE_FEE_3_NEW_FRM_MNY             1.561 0.001 1.561 0.001
-score ADVANCE_FEE_3_NEW_MONEY               2.533 0.981 2.533 0.981
-score ADVANCE_FEE_4_NEW                     2.599 2.397 2.599 2.397
-score ADVANCE_FEE_4_NEW_FRM_MNY             0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_MONEY               0.490 0.001 0.490 0.001
-score ADVANCE_FEE_5_NEW                     2.699 2.497 2.699 2.497
-score ADVANCE_FEE_5_NEW_FRM_MNY             0.536 0.001 0.536 0.001
-score ADVANCE_FEE_5_NEW_MONEY               0.052 0.001 0.052 0.001
-score AD_PREFS                              0.030 0.498 0.030 0.498
-score ALIBABA_IMG_NOT_RCVD_ALI              2.499 1.351 2.499 1.351
-score AMAZON_IMG_NOT_RCVD_AMZN              2.499 0.001 2.499 0.001
+score ADVANCE_FEE_2_NEW_FORM                0.001 0.471 0.001 0.471
+score ADVANCE_FEE_2_NEW_FRM_MNY             2.497 2.497 2.497 2.497
+score ADVANCE_FEE_2_NEW_MONEY               1.997 0.001 1.997 0.001
+score ADVANCE_FEE_3_NEW                     3.066 3.407 3.066 3.407
+score ADVANCE_FEE_3_NEW_FRM_MNY             1.811 0.001 1.811 0.001
+score ADVANCE_FEE_3_NEW_MONEY               2.083 0.982 2.083 0.982
+score ADVANCE_FEE_4_NEW                     2.696 2.397 2.696 2.397
+score ADVANCE_FEE_4_NEW_FRM_MNY             2.464 0.001 2.464 0.001
+score ADVANCE_FEE_4_NEW_MONEY               0.488 0.001 0.488 0.001
+score ADVANCE_FEE_5_NEW                     2.796 2.497 2.796 2.497
+score ADVANCE_FEE_5_NEW_FRM_MNY             1.578 0.001 1.578 0.001
+score ADVANCE_FEE_5_NEW_MONEY               0.001 0.001 0.001 0.001
+score AD_PREFS                              0.095 0.498 0.095 0.498
+score ALIBABA_IMG_NOT_RCVD_ALI              2.497 0.163 2.497 0.163
+score AMAZON_IMG_NOT_RCVD_AMZN              1.645 0.001 1.645 0.001
 score APP_DEVELOPMENT_FREEM                 1.000 1.000 1.000 1.000
-score APP_DEVELOPMENT_NORDNS                1.586 0.442 1.586 0.442
+score APP_DEVELOPMENT_NORDNS                1.997 0.205 1.997 0.205
 score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5          1.904 0.722 1.904 0.722
-score BEBEE_IMG_NOT_RCVD_BB                 1.000 0.001 1.000 0.001
-score BIGNUM_EMAILS_FREEM                   2.999 2.144 2.999 2.144
-score BIGNUM_EMAILS_MANY                    2.772 1.000 2.772 1.000
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          1.812 0.001 1.812 0.001
+score BEBEE_IMG_NOT_RCVD_BB                 1.656 0.001 1.656 0.001
+score BIGNUM_EMAILS_FREEM                   2.996 2.033 2.996 2.033
+score BIGNUM_EMAILS_MANY                    2.996 1.000 2.996 1.000
 score BITCOIN_BOMB                          1.000 1.000 1.000 1.000
 score BITCOIN_DEADLINE                      1.000 1.000 1.000 1.000
 score BITCOIN_EXTORT_01                     1.000 1.000 1.000 1.000
 score BITCOIN_EXTORT_02                     1.000 1.000 1.000 1.000
 score BITCOIN_IMGUR                         1.000 1.000 1.000 1.000
-score BITCOIN_MALF_HTML                     3.499 3.496 3.499 3.496
+score BITCOIN_MALF_HTML                     3.497 3.496 3.497 3.496
 score BITCOIN_MALWARE                       1.000 0.001 1.000 0.001
 score BITCOIN_OBFU_SUBJ                     1.000 1.000 1.000 1.000
-score BITCOIN_ONAN                          2.999 2.997 2.999 2.997
+score BITCOIN_ONAN                          2.996 2.996 2.996 2.996
 score BITCOIN_PAY_ME                        1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_01                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_02                       2.253 1.248 2.253 1.248
-score BITCOIN_SPAM_03                       2.499 2.153 2.499 2.153
+score BITCOIN_SPAM_02                       1.857 1.326 1.857 1.326
+score BITCOIN_SPAM_03                       2.497 1.532 2.497 1.532
 score BITCOIN_SPAM_04                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_05                       0.001 2.497 0.001 2.497
 score BITCOIN_SPAM_06                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07                       3.499 3.092 3.499 3.092
+score BITCOIN_SPAM_07                       3.497 3.089 3.497 3.089
 score BITCOIN_SPAM_08                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_09                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_10                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_11                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_12                       1.000 1.000 1.000 1.000
 score BITCOIN_SPF_ONLYALL                   0.001 1.000 0.001 1.000
-score BITCOIN_XPRIO                         0.001 0.223 0.001 0.223
-score BITCOIN_YOUR_INFO                     2.999 2.305 2.999 2.305
+score BITCOIN_XPRIO                         0.001 0.149 0.001 0.149
+score BITCOIN_YOUR_INFO                     2.996 2.308 2.996 2.308
 score BODY_URI_ONLY                         1.000 0.001 1.000 0.001
-score BOGUS_MIME_VERSION                    3.499 3.183 3.499 3.183
-score BOGUS_MSM_HDRS                        1.691 1.000 1.691 1.000
+score BOGUS_MIME_VERSION                    3.496 3.278 3.496 3.278
+score BOGUS_MSM_HDRS                        1.300 1.000 1.300 1.000
 score BOMB_FREEM                            1.000 1.000 1.000 1.000
 score BOMB_MONEY                            1.000 1.000 1.000 1.000
 score BTC_ORG                               1.000 1.000 1.000 1.000
-score BULK_RE_SUSP_NTLD                     0.999 1.000 0.999 1.000
+score BULK_RE_SUSP_NTLD                     0.998 1.000 0.998 1.000
 score CANT_SEE_AD                           1.000 1.000 1.000 1.000
 score CK_HELO_GENERIC                       0.249 0.008 0.249 0.008
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
 score COMPENSATION                          1.000 1.000 1.000 1.000
-score CONTENT_AFTER_HTML                    2.499 2.417 2.499 2.417
-score CTE_8BIT_MISMATCH                     0.999 0.001 0.999 0.001
+score CONTENT_AFTER_HTML                    2.497 2.418 2.497 2.418
+score CTE_8BIT_MISMATCH                     0.998 0.001 0.998 0.001
 score DAY_I_EARNED                          1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY                      1.532 2.896 1.532 2.896
-score DETAILS_OF_PRODUCT                    1.249 1.248 1.249 1.248
-score DKIMWL_BL                             0.001 2.313 0.001 2.313
+score DEAR_BENEFICIARY                      3.096 2.896 3.096 2.896
+score DETAILS_OF_PRODUCT                    1.248 1.248 1.248 1.248
+score DKIMWL_BL                             0.001 2.334 0.001 2.334
 score DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH                        0.001 -0.719 0.001 -0.719
+score DKIMWL_WL_HIGH                        0.001 -0.717 0.001 -0.717
 score DKIMWL_WL_MED                         0.001 -0.001 0.001 -0.001
-score DKIMWL_WL_MEDHI                       0.001 -0.672 0.001 -0.672
+score DKIMWL_WL_MEDHI                       0.001 -0.275 0.001 -0.275
 score DOTGOV_IMAGE                          1.000 1.000 1.000 1.000
-score DX_TEXT_03                            0.900 0.698 0.900 0.698
-score DYNAMIC_IMGUR                         1.000 3.815 1.000 3.815
-score EBAY_IMG_NOT_RCVD_EBAY                0.243 1.130 0.243 1.130
-score ENCRYPTED_MESSAGE                     -0.906 -0.998 -0.906 -0.998
+score DX_TEXT_03                            0.899 0.698 0.899 0.698
+score DYNAMIC_IMGUR                         1.000 2.851 1.000 2.851
+score EBAY_IMG_NOT_RCVD_EBAY                0.882 1.666 0.882 1.666
+score ENCRYPTED_MESSAGE                     -0.898 -0.998 -0.898 -0.998
 score END_FUTURE_EMAILS                     1.000 1.000 1.000 1.000
 score ENVFROM_GOOG_TRIX                     1.000 1.000 1.000 1.000
-score FACEBOOK_IMG_NOT_RCVD_FB              1.999 1.997 1.999 1.997
-score FAKE_REPLY_A1                         4.000 3.611 4.000 3.611
-score FAKE_REPLY_B                          3.900 3.695 3.900 3.695
+score FACEBOOK_IMG_NOT_RCVD_FB              1.997 1.997 1.997 1.997
+score FAKE_REPLY_A1                         3.995 2.642 3.995 2.642
+score FAKE_REPLY_B                          3.895 3.695 3.895 3.695
 score FBI_MONEY                             1.000 1.000 1.000 1.000
 score FBI_SPOOF                             1.000 1.000 1.000 1.000
 score FILL_THIS_FORM                        1.198 0.001 1.198 0.001
-score FONT_INVIS_DIRECT                     2.399 0.001 2.399 0.001
-score FONT_INVIS_DOTGOV                     3.499 3.496 3.499 3.496
-score FONT_INVIS_HTML_NOHTML                2.999 2.996 2.999 2.996
-score FONT_INVIS_LONG_LINE                  2.999 2.996 2.999 2.996
-score FONT_INVIS_MSGID                      2.499 1.843 2.499 1.843
-score FONT_INVIS_NORDNS                     2.087 2.300 2.087 2.300
+score FONT_INVIS_DIRECT                     2.395 0.001 2.395 0.001
+score FONT_INVIS_DOTGOV                     3.497 3.496 3.497 3.496
+score FONT_INVIS_HTML_NOHTML                2.996 2.996 2.996 2.996
+score FONT_INVIS_LONG_LINE                  2.996 1.000 2.996 1.000
+score FONT_INVIS_MSGID                      2.497 1.842 2.497 1.842
+score FONT_INVIS_NORDNS                     2.123 1.749 2.123 1.749
 score FONT_INVIS_POSTEXTRAS                 1.000 1.000 1.000 1.000
 score FORM_FRAUD                            1.000 0.001 1.000 0.001
 score FORM_FRAUD_5                          0.001 0.001 0.001 0.001
 score FORM_LOW_CONTRAST                     1.000 1.000 1.000 1.000
-score FOUND_YOU                             3.249 0.302 3.249 0.302
-score FREEMAIL_FORGED_FROMDOMAIN            0.250 0.248 0.250 0.248
+score FOUND_YOU                             3.246 1.913 3.246 1.913
+score FREEMAIL_FORGED_FROMDOMAIN            0.249 0.249 0.249 0.249
 score FREEM_FRNUM_UNICD_EMPTY               1.000 1.000 1.000 1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB            1.000 1.000 1.000 1.000
-score FROMSPACE                             3.200 2.534 3.200 2.534
-score FROM_2_EMAILS_SHORT                   2.650 2.996 2.650 2.996
+score FROMSPACE                             3.096 2.595 3.096 2.595
+score FROM_2_EMAILS_SHORT                   2.568 2.996 2.568 2.996
 score FROM_ADDR_WS                          1.000 1.000 1.000 1.000
 score FROM_BANK_NOAUTH                      0.001 0.998 0.001 0.998
 score FROM_FMBLA_NDBLOCKED                  0.001 0.001 0.001 0.001
 score FROM_FMBLA_NEWDOM                     0.001 1.498 0.001 1.498
 score FROM_FMBLA_NEWDOM14                   0.001 0.998 0.001 0.998
-score FROM_FMBLA_NEWDOM28                   0.001 0.799 0.001 0.799
-score FROM_GOV_DKIM_AU                      0.001 -0.736 0.001 -0.736
+score FROM_FMBLA_NEWDOM28                   0.001 0.798 0.001 0.798
+score FROM_GOV_DKIM_AU                      0.001 -0.752 0.001 -0.752
 score FROM_GOV_REPLYTO_FREEMAIL             0.001 1.000 0.001 1.000
 score FROM_GOV_SPOOF                        0.001 0.001 0.001 0.001
-score FROM_IN_TO_AND_SUBJ                   2.499 0.001 2.499 0.001
-score FROM_MISSPACED                        0.001 0.001 0.001 0.001
+score FROM_IN_TO_AND_SUBJ                   2.498 0.001 2.498 0.001
+score FROM_MISSPACED                        1.891 0.001 1.891 0.001
+score FROM_MISSP_DYNIP                      0.001 2.197 0.001 2.197
 score FROM_MISSP_EH_MATCH                   0.001 0.001 0.001 0.001
-score FROM_MISSP_FREEMAIL                   2.502 0.001 2.502 0.001
+score FROM_MISSP_FREEMAIL                   2.500 0.001 2.500 0.001
 score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
-score FROM_MISSP_PHISH                      3.499 3.496 3.499 3.496
+score FROM_MISSP_PHISH                      3.496 3.496 3.496 3.496
+score FROM_MISSP_REPLYTO                    1.000 0.001 1.000 0.001
 score FROM_MISSP_SPF_FAIL                   0.001 0.001 0.001 0.001
 score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
-score FROM_MULTI_NORDNS                     0.354 2.093 0.354 2.093
-score FROM_NAME_EQ_TO_G_DRIVE               0.385 0.465 0.385 0.465
+score FROM_MULTI_NORDNS                     0.353 2.346 0.353 2.346
+score FROM_NAME_EQ_TO_G_DRIVE               0.402 0.001 0.402 0.001
 score FROM_NEWDOM_BTC                       0.001 1.000 0.001 1.000
 score FROM_NTLD_LINKBAIT                    1.000 1.000 1.000 1.000
-score FROM_NTLD_REPLY_FREEMAIL              1.999 0.594 1.999 0.594
+score FROM_NTLD_REPLY_FREEMAIL              1.579 1.121 1.579 1.121
 score FROM_NUMBERO_NEWDOMAIN                0.001 1.000 0.001 1.000
 score FROM_NUMERIC_TLD                      1.000 1.000 1.000 1.000
 score FROM_PAYPAL_SPOOF                     0.001 0.001 0.001 0.001
-score FROM_SUSPICIOUS_NTLD                  0.500 0.498 0.500 0.498
-score FROM_SUSPICIOUS_NTLD_FP               1.999 1.025 1.999 1.025
-score FSL_BULK_SIG                          0.001 2.620 0.001 2.620
+score FROM_SUSPICIOUS_NTLD                  0.498 0.499 0.498 0.499
+score FROM_SUSPICIOUS_NTLD_FP               1.998 1.099 1.998 1.099
+score FSL_BULK_SIG                          0.001 2.617 0.001 2.617
 score FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
-score FSL_HELO_FAKE                         3.100 2.896 3.100 2.896
+score FSL_HELO_FAKE                         3.096 2.896 3.096 2.896
 score FSL_NEW_HELO_USER                     0.001 0.001 0.001 0.001
-score FUZZY_AMAZON                          2.399 2.198 2.399 2.198
+score FUZZY_AMAZON                          2.497 2.197 2.497 2.197
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
 score GB_FAKE_RF_SHORT                      1.000 1.997 1.000 1.997
 score GB_FORGED_MUA_POSTFIX                 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO                    0.499 0.499 0.499 0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM           0.499 0.498 0.499 0.498
+score GB_FREEMAIL_DISPTO                    0.499 0.498 0.499 0.498
+score GB_FREEMAIL_DISPTO_NOTFREEM           0.498 0.498 0.498 0.498
 score GB_GOOGLE_OBFUR                       0.750 0.750 0.750 0.750
 score GOOGLE_DOCS_PHISH                     1.000 1.000 1.000 1.000
 score GOOGLE_DOCS_PHISH_MANY                1.000 1.000 1.000 1.000
-score GOOGLE_DOC_SUSP                       2.501 2.996 2.501 2.996
+score GOOGLE_DOC_SUSP                       2.495 2.996 2.495 2.996
 score GOOGLE_DRIVE_REPLY_BAD_NTLD           1.000 1.000 1.000 1.000
 score GOOG_MALWARE_DNLD                     1.000 1.000 1.000 1.000
-score GOOG_REDIR_NORDNS                     2.600 2.996 2.600 2.996
-score GOOG_STO_EMAIL_PHISH                  2.618 2.727 2.618 2.727
-score GOOG_STO_HTML_PHISH                   2.543 1.177 2.543 1.177
-score GOOG_STO_HTML_PHISH_MANY              2.386 3.326 2.386 3.326
-score GOOG_STO_IMG_HTML                     2.999 2.997 2.999 2.997
+score GOOG_REDIR_NORDNS                     3.399 2.996 3.399 2.996
+score GOOG_STO_EMAIL_PHISH                  2.293 2.563 2.293 2.563
+score GOOG_STO_HTML_PHISH                   2.061 2.424 2.061 2.424
+score GOOG_STO_HTML_PHISH_MANY              3.216 1.648 3.216 1.648
+score GOOG_STO_IMG_HTML                     2.996 2.996 2.996 2.996
 score GOOG_STO_IMG_NOHTML                   1.000 1.000 1.000 1.000
-score GOOG_STO_NOIMG_HTML                   2.999 2.996 2.999 2.996
+score GOOG_STO_NOIMG_HTML                   2.996 2.996 2.996 2.996
 score HAS_X_NO_RELAY                        1.000 1.000 1.000 1.000
-score HAS_X_OUTGOING_SPAM_STAT              1.999 0.793 1.999 0.793
-score HDRS_LCASE                            0.100 0.099 0.100 0.099
-score HDRS_LCASE_IMGONLY                    0.099 0.093 0.099 0.093
-score HDRS_MISSP                            1.881 0.001 1.881 0.001
-score HDR_ORDER_FTSDMCXX_DIRECT             1.089 0.001 1.089 0.001
+score HAS_X_OUTGOING_SPAM_STAT              1.997 1.025 1.997 1.025
+score HDRS_LCASE                            0.100 0.098 0.100 0.098
+score HDRS_LCASE_IMGONLY                    0.098 0.001 0.098 0.001
+score HDRS_MISSP                            1.693 0.001 1.693 0.001
+score HDR_ORDER_FTSDMCXX_DIRECT             1.348 0.001 1.348 0.001
 score HDR_ORDER_FTSDMCXX_NORDNS             0.001 0.001 0.001 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS         0.250 0.249 0.250 0.249
+score HEADER_FROM_DIFFERENT_DOMAINS         0.249 0.248 0.249 0.248
 score HELO_NO_DOMAIN                        0.001 0.001 0.001 0.001
 score HEXHASH_WORD                          1.000 1.000 1.000 1.000
 score HK_CTE_RAW                            1.000 1.000 1.000 1.000
-score HK_NAME_FM_MR_MRS                     1.499 0.542 1.499 0.542
-score HK_NAME_MR_MRS                        1.000 0.086 1.000 0.086
-score HK_RANDOM_ENVFROM                     1.000 0.998 1.000 0.998
-score HK_RANDOM_FROM                        1.000 0.999 1.000 0.999
-score HK_RANDOM_REPLYTO                     0.999 0.586 0.999 0.586
+score HK_NAME_FM_MR_MRS                     1.498 0.749 1.498 0.749
+score HK_NAME_MR_MRS                        0.998 0.218 0.998 0.218
+score HK_RANDOM_ENVFROM                     0.998 0.998 0.998 0.998
+score HK_RANDOM_FROM                        0.998 0.998 0.998 0.998
+score HK_RANDOM_REPLYTO                     0.998 0.395 0.998 0.395
 score HK_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
-score HK_SCAM                               0.543 0.001 0.543 0.001
+score HK_SCAM                               0.483 0.001 0.483 0.001
 score HK_WIN                                1.000 1.000 1.000 1.000
-score HOSTED_IMG_DIRECT_MX                  1.859 2.505 1.859 2.505
+score HOSTED_IMG_DIRECT_MX                  1.768 1.988 1.768 1.988
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM                      3.499 3.496 3.499 3.496
-score HOSTED_IMG_MULTI                      2.015 1.000 2.015 1.000
-score HOSTED_IMG_MULTI_PUB_01               2.999 2.996 2.999 2.996
-score HTML_ENTITY_ASCII                     1.000 1.000 1.000 1.000
+score HOSTED_IMG_FREEM                      3.497 3.496 3.497 3.496
+score HOSTED_IMG_MULTI                      1.092 1.000 1.092 1.000
+score HOSTED_IMG_MULTI_PUB_01               2.997 2.996 2.997 2.996
+score HTML_ENTITY_ASCII                     2.999 1.000 2.999 1.000
 score HTML_ENTITY_ASCII_TINY                1.000 1.000 1.000 1.000
-score HTML_OFF_PAGE                         2.999 1.813 2.999 1.813
+score HTML_OFF_PAGE                         2.996 2.663 2.996 2.663
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY                     1.000 0.903 1.000 0.903
-score HTML_TAG_BALANCE_CENTER               1.703 0.001 1.703 0.001
-score HTML_TEXT_INVISIBLE_FONT              1.000 0.028 1.000 0.028
-score HTML_TEXT_INVISIBLE_STYLE             2.481 2.020 2.481 2.020
-score IMG_ONLY_FM_DOM_INFO                  1.000 1.000 1.000 1.000
-score JH_SPAMMY_HEADERS                     3.499 3.496 3.499 3.496
+score HTML_SINGLET_MANY                     1.000 0.998 1.000 0.998
+score HTML_TAG_BALANCE_CENTER               2.097 0.001 2.097 0.001
+score HTML_TEXT_INVISIBLE_FONT              1.000 0.146 1.000 0.146
+score HTML_TEXT_INVISIBLE_STYLE             2.083 2.084 2.083 2.084
+score IMG_ONLY_FM_DOM_INFO                  1.275 1.000 1.275 1.000
+score JH_SPAMMY_HEADERS                     3.496 3.496 3.496 3.496
 score JH_SPAMMY_PATTERN01                   1.000 1.000 1.000 1.000
 score JH_SPAMMY_PATTERN02                   1.000 1.000 1.000 1.000
 score KHOP_HELO_FCRDNS                      0.400 0.398 0.400 0.398
-score LINKEDIN_IMG_NOT_RCVD_LNKN            2.499 2.079 2.499 2.079
+score LINKEDIN_IMG_NOT_RCVD_LNKN            2.497 2.499 2.497 2.499
 score LIST_PRTL_PUMPDUMP                    1.000 1.000 1.000 1.000
 score LIST_PRTL_SAME_USER                   1.000 1.000 1.000 1.000
-score LONG_HEX_URI                          2.999 0.942 2.999 0.942
-score LONG_IMG_URI                          0.884 0.933 0.884 0.933
-score LONG_INVISIBLE_TEXT                   1.768 0.156 1.768 0.156
+score LONG_HEX_URI                          2.996 0.948 2.996 0.948
+score LONG_IMG_URI                          0.890 0.943 0.890 0.943
+score LONG_INVISIBLE_TEXT                   1.735 0.171 1.735 0.171
 score LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
-score LOTTO_AGENT                           1.000 1.498 1.000 1.498
+score LOTTO_AGENT                           0.986 1.498 0.986 1.498
+score LOTTO_DEPT                            1.997 0.001 1.997 0.001
 score LUCRATIVE                             1.000 1.000 1.000 1.000
 score MALF_HTML_B64                         1.000 1.000 1.000 1.000
-score MALWARE_NORDNS                        2.102 0.443 2.102 0.443
+score MALWARE_NORDNS                        2.103 0.352 2.103 0.352
 score MALWARE_PASSWORD                      1.000 1.000 1.000 1.000
-score MANY_SPAN_IN_TEXT                     2.399 2.297 2.399 2.297
-score MILLION_HUNDRED                       3.199 2.896 3.199 2.896
-score MILLION_USD                           0.001 0.001 0.001 0.001
-score MIMEOLE_DIRECT_TO_MX                  1.013 0.231 1.013 0.231
+score MANY_HDRS_LCASE                       0.100 0.100 0.100 0.100
+score MANY_SPAN_IN_TEXT                     2.397 2.297 2.397 2.297
+score MILLION_HUNDRED                       3.196 2.896 3.196 2.896
+score MILLION_USD                           0.216 0.001 0.216 0.001
+score MIMEOLE_DIRECT_TO_MX                  0.553 0.320 0.553 0.320
 score MIME_NO_TEXT                          1.000 1.000 1.000 1.000
-score MIXED_AREA_CASE                       1.377 2.442 1.377 2.442
-score MIXED_CENTER_CASE                     2.499 1.034 2.499 1.034
-score MIXED_ES                              3.000 2.597 3.000 2.597
-score MIXED_FONT_CASE                       1.093 1.309 1.093 1.309
-score MIXED_HREF_CASE                       1.374 0.801 1.374 0.801
-score MIXED_IMG_CASE                        0.300 0.756 0.300 0.756
+score MIXED_AREA_CASE                       1.547 0.641 1.547 0.641
+score MIXED_CENTER_CASE                     1.630 2.164 1.630 2.164
+score MIXED_ES                              2.997 2.598 2.997 2.598
+score MIXED_FONT_CASE                       1.342 1.594 1.342 1.594
+score MIXED_HREF_CASE                       1.896 0.606 1.896 0.606
+score MIXED_IMG_CASE                        2.570 1.623 2.570 1.623
 score MONERO_DEADLINE                       1.000 1.000 1.000 1.000
 score MONERO_EXTORT_01                      1.000 1.000 1.000 1.000
 score MONERO_MALWARE                        1.000 1.000 1.000 1.000
 score MONERO_PAY_ME                         1.000 1.000 1.000 1.000
-score MONEY_ATM_CARD                        2.899 0.001 2.899 0.001
-score MONEY_FORM                            0.074 0.001 0.074 0.001
-score MONEY_FORM_SHORT                      1.250 0.001 1.250 0.001
+score MONEY_ATM_CARD                        1.911 0.001 1.911 0.001
+score MONEY_FORM                            0.001 0.001 0.001 0.001
+score MONEY_FORM_SHORT                      1.239 0.001 1.239 0.001
 score MONEY_FRAUD_3                         0.001 0.001 0.001 0.001
-score MONEY_FRAUD_5                         0.655 0.001 0.655 0.001
-score MONEY_FRAUD_8                         0.406 0.001 0.406 0.001
-score MONEY_FREEMAIL_REPTO                  2.999 1.216 2.999 1.216
-score MONEY_FROM_41                         1.999 1.997 1.999 1.997
+score MONEY_FRAUD_5                         0.657 0.001 0.657 0.001
+score MONEY_FRAUD_8                         0.785 0.001 0.785 0.001
+score MONEY_FREEMAIL_REPTO                  2.996 1.329 2.996 1.329
+score MONEY_FROM_41                         1.997 1.997 1.997 1.997
 score MONEY_FROM_MISSP                      0.001 0.001 0.001 0.001
-score MONEY_NOHTML                          1.554 1.117 1.554 1.117
+score MONEY_NOHTML                          1.671 0.948 1.671 0.948
 score MSGID_DOLLARS_URI_IMG                 1.000 1.000 1.000 1.000
 score MSGID_HDR_MALF                        1.000 1.000 1.000 1.000
-score MSGID_WSP_TRAIL                       0.927 1.271 0.927 1.271
-score MSMAIL_PRI_ABNORMAL                   0.001 0.001 0.001 0.001
+score MSGID_WSP_TRAIL                       1.062 0.675 1.062 0.675
+score MSMAIL_PRI_ABNORMAL                   0.314 1.179 0.314 1.179
 score MSM_PRIO_REPTO                        1.000 1.000 1.000 1.000
-score NAME_EMAIL_DIFF                       1.850 2.443 1.850 2.443
-score NA_DOLLARS                            1.434 0.451 1.434 0.451
+score NAME_EMAIL_DIFF                       1.917 2.441 1.917 2.441
+score NA_DOLLARS                            0.829 0.538 0.829 0.538
 score NEWEGG_IMG_NOT_RCVD_NEGG              1.000 1.000 1.000 1.000
-score NEW_PRODUCTS                          1.249 1.248 1.249 1.248
-score NICE_REPLY_A                          -1.718 -0.277 -1.718 -0.277
-score NOT_SPAM                              3.299 2.996 3.299 2.996
-score NO_FM_NAME_IP_HOSTN                   0.198 0.486 0.198 0.486
+score NEW_PRODUCTS                          1.248 1.248 1.248 1.248
+score NICE_REPLY_A                          -0.246 -0.125 -0.246 -0.125
+score NOT_SPAM                              3.296 3.096 3.296 3.096
+score NO_FM_NAME_IP_HOSTN                   0.288 0.491 0.288 0.491
 score NSL_RCVD_FROM_USER                    0.001 0.001 0.001 0.001
 score NSL_RCVD_HELO_USER                    0.001 0.001 0.001 0.001
-score NUMBEREND_LINKBAIT                    0.343 0.346 0.343 0.346
+score NUMBEREND_LINKBAIT                    0.999 0.575 0.999 0.575
 score OBFU_BITCOIN                          1.000 1.000 1.000 1.000
 score OBFU_TEXT_ATTACH                      0.001 0.001 0.001 0.001
-score ODD_FREEM_REPTO                       2.999 2.722 2.999 2.722
-score OFFER_ONLY_AMERICA                    0.828 1.000 0.828 1.000
-score ONLINE_MKTG_CNSLT                     2.600 2.297 2.600 2.297
-score ORDER_TODAY                           1.035 0.405 1.035 0.405
-score PDS_BTC_ID                            0.499 0.498 0.499 0.498
+score ODD_FREEM_REPTO                       2.996 2.448 2.996 2.448
+score OFFER_ONLY_AMERICA                    1.650 1.000 1.650 1.000
+score ONLINE_MKTG_CNSLT                     2.596 2.397 2.596 2.397
+score ORDER_TODAY                           1.569 1.240 1.569 1.240
+score PDS_BTC_ID                            0.498 0.498 0.498 0.498
 score PDS_BTC_MSGID                         0.001 0.001 0.001 0.001
-score PDS_BTC_NTLD                          1.999 0.224 1.999 0.224
-score PDS_DBL_URL_TNB_RUNON                 1.999 1.000 1.999 1.000
-score PDS_FRNOM_TODOM_DBL_URL               1.490 1.498 1.490 1.498
-score PDS_FRNOM_TODOM_NAKED_TO              1.499 1.498 1.499 1.498
-score PDS_FROM_2_EMAILS                     1.000 0.001 1.000 0.001
-score PDS_FROM_2_EMAILS_SHRTNER             1.499 1.498 1.499 1.498
-score PDS_FROM_NAME_TO_DOMAIN               1.999 1.997 1.999 1.997
+score PDS_BTC_NTLD                          1.923 1.220 1.923 1.220
+score PDS_DBL_URL_TNB_RUNON                 1.997 1.000 1.997 1.000
+score PDS_FRNOM_TODOM_DBL_URL               1.499 1.498 1.499 1.498
+score PDS_FRNOM_TODOM_NAKED_TO              1.498 1.498 1.498 1.498
+score PDS_FROM_2_EMAILS_SHRTNER             1.013 1.498 1.013 1.498
+score PDS_FROM_NAME_TO_DOMAIN               1.997 1.997 1.997 1.997
 score PDS_HELO_SPF_FAIL                     0.001 1.000 0.001 1.000
-score PDS_HP_HELO_NORDNS                    0.999 0.998 0.999 0.998
-score PDS_OTHER_BAD_TLD                     1.999 1.997 1.999 1.997
-score PDS_PHP_EVAL                          1.499 1.498 1.499 1.498
+score PDS_HP_HELO_NORDNS                    0.998 0.998 0.998 0.998
+score PDS_OTHER_BAD_TLD                     1.997 1.997 1.997 1.997
+score PDS_PHP_EVAL                          1.498 1.498 1.498 1.498
 score PDS_RDNS_DYNAMIC_FP                   0.001 0.001 0.001 0.001
-score PDS_SHORTFWD_URISHRT_FP               1.499 1.476 1.499 1.476
-score PDS_TINYSUBJ_URISHRT                  1.499 1.499 1.499 1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.999 1.593 1.999 1.593
-score PDS_TO_EQ_FROM_NAME                   3.099 2.975 3.099 2.975
+score PDS_SHORTFWD_URISHRT_FP               1.498 1.216 1.498 1.216
+score PDS_TINYSUBJ_URISHRT                  1.499 1.498 1.499 1.498
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.997 1.594 1.997 1.594
+score PDS_TO_EQ_FROM_NAME                   3.196 2.590 3.196 2.590
 score PHISH_AZURE_CLOUDAPP                  3.500 3.500 3.500 3.500
 score PHISH_FBASEAPP                        1.000 1.000 1.000 1.000
 score PHOTO_EDITING_DIRECT                  1.000 1.000 1.000 1.000
 score PHOTO_EDITING_FREEM                   1.000 1.000 1.000 1.000
 score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT                       2.407 0.587 2.407 0.587
-score PHP_ORIG_SCRIPT_EVAL                  3.000 2.996 3.000 2.996
-score PHP_SCRIPT                            2.499 2.497 2.499 2.497
+score PHP_ORIG_SCRIPT                       2.249 0.585 2.249 0.585
+score PHP_ORIG_SCRIPT_EVAL                  2.996 2.996 2.996 2.996
+score PHP_SCRIPT                            2.497 2.265 2.497 2.265
 score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT               0.999 0.998 0.999 0.998
+score PP_MIME_FAKE_ASCII_TEXT               0.998 0.998 0.998 0.998
 score PP_TOO_MUCH_UNICODE02                 0.500 0.500 0.500 0.500
 score PP_TOO_MUCH_UNICODE05                 1.000 1.000 1.000 1.000
 score PUMPDUMP                              1.000 1.000 1.000 1.000
 score PUMPDUMP_MULTI                        1.000 1.000 1.000 1.000
-score RAND_HEADER_LIST_SPOOF                2.999 2.996 2.999 2.996
+score RAND_HEADER_LIST_SPOOF                2.996 2.996 2.996 2.996
 score RAND_HEADER_MANY                      1.000 1.000 1.000 1.000
-score RAND_MKTG_HEADER                      1.999 1.997 1.999 1.997
-score RATWARE_NO_RDNS                       2.760 2.354 2.760 2.354
+score RAND_MKTG_HEADER                      1.997 1.997 1.997 1.997
+score RATWARE_NO_RDNS                       1.892 1.647 1.892 1.647
 score RCVD_DOTEDU_SHORT                     1.000 1.000 1.000 1.000
 score RCVD_DOTEDU_SUSP_URI                  1.000 1.000 1.000 1.000
 score RCVD_IN_MSPIKE_BL                     0.001 0.001 0.001 0.001
@@ -307,15 +310,15 @@
 score RCVD_IN_MSPIKE_WL                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_ZBI                    0.001 0.001 0.001 0.001
 score RDNS_NUM_TLD_ATCHNX                   1.000 1.000 1.000 1.000
-score RDNS_NUM_TLD_XM                       2.012 1.994 2.012 1.994
-score READY_TO_SHIP                         1.249 1.248 1.249 1.248
-score REPLYTO_EMPTY                         2.400 0.001 2.400 0.001
-score REPTO_419_FRAUD                       1.921 2.999 1.921 2.999
+score RDNS_NUM_TLD_XM                       1.628 1.887 1.628 1.887
+score READY_TO_SHIP                         1.248 1.248 1.248 1.248
+score REPLYTO_EMPTY                         2.397 0.001 2.397 0.001
+score REPTO_419_FRAUD                       2.938 2.999 2.938 2.999
 score REPTO_419_FRAUD_AOL                   1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL_LOOSE             1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_CNS                   1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_GM                    2.999 2.851 2.999 2.851
-score REPTO_419_FRAUD_GM_LOOSE              0.999 0.998 0.999 0.998
+score REPTO_419_FRAUD_GM                    2.996 2.715 2.996 2.715
+score REPTO_419_FRAUD_GM_LOOSE              0.998 0.998 0.998 0.998
 score REPTO_419_FRAUD_HM                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_OL                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_PM                    1.000 1.000 1.000 1.000
@@ -324,90 +327,93 @@
 score REPTO_419_FRAUD_YH_LOOSE              1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_YJ                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_YN                    1.000 1.000 1.000 1.000
-score RISK_FREE                             3.099 2.896 3.099 2.896
-score SCC_NEWBIE_HASBEENS                   1.728 1.699 1.728 1.699
-score SENDGRID_REDIR                        1.499 1.240 1.499 1.240
+score RISK_FREE                             3.096 2.896 3.096 2.896
+score SCC_NEWBIE_HASBEENS                   1.717 1.044 1.717 1.044
+score SENDGRID_REDIR                        1.498 1.098 1.498 1.098
 score SENDGRID_REDIR_PHISH                  1.000 1.000 1.000 1.000
 score SEO_SUSP_NTLD                         1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_VIAGRA01               2.894 4.096 2.894 4.096
-score SHOPIFY_IMG_NOT_RCVD_SFY              2.500 2.498 2.500 2.498
-score SHORTENER_SHORT_IMG                   2.330 2.136 2.330 2.136
+score SERGIO_SUBJECT_VIAGRA01               3.095 4.095 3.095 4.095
+score SHOPIFY_IMG_NOT_RCVD_SFY              2.497 2.497 2.497 2.497
+score SHORTENER_SHORT_IMG                   0.973 1.221 0.973 1.221
 score SHORT_IMG_SUSP_NTLD                   1.000 1.000 1.000 1.000
-score SHORT_SHORTNER                        1.999 0.715 1.999 0.715
-score SPOOFED_FREEMAIL                      0.001 1.221 0.001 1.221
+score SHORT_SHORTNER                        1.997 0.676 1.997 0.676
+score SPOOFED_FREEMAIL                      0.001 1.224 0.001 1.224
 score SPOOFED_FREEMAIL_NO_RDNS              1.000 0.001 1.000 0.001
 score SPOOFED_FREEM_REPTO                   0.001 0.001 0.001 0.001
-score SPOOFED_FREEM_REPTO_CHN               0.001 3.379 0.001 3.379
+score SPOOFED_FREEM_REPTO_CHN               0.001 0.646 0.001 0.646
 score SPOOFED_FREEM_REPTO_RUS               0.001 1.000 0.001 1.000
 score SPOOF_GMAIL_MID                       1.000 1.498 1.000 1.498
-score STATIC_XPRIO_OLE                      1.191 1.997 1.191 1.997
+score STATIC_XPRIO_OLE                      1.552 1.997 1.552 1.997
 score STOCK_LOW_CONTRAST                    1.000 1.000 1.000 1.000
 score STOCK_TIP                             1.000 1.000 1.000 1.000
 score SUBJ_BRKN_WORDNUMS                    1.000 0.001 1.000 0.001
 score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
 score SYSADMIN                              1.000 1.000 1.000 1.000
-score TAGSTAT_IMG_NOT_RCVD_TGST             1.999 1.997 1.999 1.997
-score TARINGANET_IMG_NOT_RCVD_TN            1.000 0.001 1.000 0.001
-score THIS_AD                               1.299 0.998 1.299 0.998
-score THIS_IS_ADV_SUSP_NTLD                 0.602 1.000 0.602 1.000
+score TAGSTAT_IMG_NOT_RCVD_TGST             1.997 1.997 1.997 1.997
+score TARINGANET_IMG_NOT_RCVD_TN            1.999 0.001 1.999 0.001
+score THIS_AD                               1.298 0.999 1.298 0.999
+score THIS_IS_ADV_SUSP_NTLD                 1.477 1.000 1.477 1.000
 score TONLINE_FAKE_DKIM                     1.000 1.000 1.000 1.000
 score TO_EQ_FM_DIRECT_MX                    0.001 2.497 0.001 2.497
 score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
 score TO_EQ_FM_SPF_FAIL                     0.001 0.001 0.001 0.001
-score TO_IN_SUBJ                            0.099 0.098 0.099 0.098
-score TO_NAME_SUBJ_NO_RDNS                  1.000 2.637 1.000 2.637
-score TO_NO_BRKTS_FROM_MSSP                 2.499 0.001 2.499 0.001
-score TO_NO_BRKTS_HTML_IMG                  1.999 0.071 1.999 0.071
-score TO_NO_BRKTS_HTML_ONLY                 1.999 1.997 1.999 1.997
-score TO_NO_BRKTS_NORDNS_HTML               2.000 1.204 2.000 1.204
-score TO_NO_BRKTS_PCNT                      2.499 2.497 2.499 2.497
-score TRANSFORM_LIFE                        2.499 2.497 2.499 2.497
-score TVD_PH_BODY_META                      3.100 2.796 3.100 2.796
-score TVD_RCVD_SPACE_BRACKET                2.799 1.767 2.799 1.767
+score TO_IN_SUBJ                            0.098 0.098 0.098 0.098
+score TO_NAME_SUBJ_NO_RDNS                  1.000 2.128 1.000 2.128
+score TO_NO_BRKTS_FROM_MSSP                 2.497 0.001 2.497 0.001
+score TO_NO_BRKTS_HTML_IMG                  1.997 0.078 1.997 0.078
+score TO_NO_BRKTS_HTML_ONLY                 1.997 1.997 1.997 1.997
+score TO_NO_BRKTS_MSFT                      1.000 0.001 1.000 0.001
+score TO_NO_BRKTS_NORDNS_HTML               1.997 1.205 1.997 1.205
+score TO_NO_BRKTS_PCNT                      2.498 2.497 2.498 2.497
+score TRANSFORM_LIFE                        2.497 2.497 2.497 2.497
+score TVD_PH_BODY_META                      3.096 2.796 3.096 2.796
+score TVD_RCVD_SPACE_BRACKET                2.797 1.087 2.797 1.087
 score TVD_SPACE_ENCODED                     1.000 0.001 1.000 0.001
+score TVD_SPACE_RATIO_MINFP                 1.000 0.001 1.000 0.001
 score TW_GIBBERISH_MANY                     1.000 1.000 1.000 1.000
 score UC_GIBBERISH_OBFU                     1.000 1.000 1.000 1.000
-score UNDISC_FREEM                          2.999 2.696 2.999 2.696
-score UNDISC_MONEY                          3.399 3.096 3.399 3.096
+score UNDISC_FREEM                          3.096 2.696 3.096 2.696
+score UNDISC_MONEY                          3.396 3.096 3.396 3.096
 score UNICODE_OBFU_ASC                      1.000 1.000 1.000 1.000
 score UNICODE_OBFU_ZW                       1.000 1.000 1.000 1.000
 score URI_ADOBESPARK                        1.000 1.000 1.000 1.000
 score URI_AZURE_CLOUDAPP                    1.000 1.000 1.000 1.000
 score URI_DASHGOVEDU                        1.000 1.000 1.000 1.000
 score URI_DATA                              1.000 1.000 1.000 1.000
-score URI_DEOBFU_INSTR                      4.399 4.195 4.399 4.195
-score URI_DOTEDU                            1.999 1.837 1.999 1.837
+score URI_DEOBFU_INSTR                      4.395 4.195 4.395 4.195
+score URI_DOTEDU                            1.997 1.773 1.997 1.773
 score URI_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
-score URI_DQ_UNSUB                          2.499 1.821 2.499 1.821
-score URI_FIREBASEAPP                       2.999 2.996 2.999 2.996
-score URI_GOOGLE_PROXY                      3.099 2.596 3.099 2.596
-score URI_GOOG_STO_SPAMMY                   2.999 2.996 2.999 2.996
+score URI_DQ_UNSUB                          2.497 1.896 2.497 1.896
+score URI_FIREBASEAPP                       2.996 2.996 2.996 2.996
+score URI_GOOGLE_PROXY                      3.096 2.596 3.096 2.596
+score URI_GOOG_STO_SPAMMY                   2.996 2.996 2.996 2.996
 score URI_HEX_IP                            1.000 1.000 1.000 1.000
 score URI_IMG_WP_REDIR                      1.000 1.000 1.000 1.000
-score URI_LONG_REPEAT                       2.499 2.422 2.499 2.422
+score URI_LONG_REPEAT                       2.497 2.351 2.497 2.351
 score URI_ONLY_MSGID_MALF                   1.000 0.001 1.000 0.001
 score URI_OPTOUT_3LD                        1.000 1.000 1.000 1.000
-score URI_PHISH                             4.000 3.310 4.000 3.310
-score URI_PHP_REDIR                         3.499 3.496 3.499 3.496
-score URI_TRY_3LD                           1.999 1.997 1.999 1.997
+score URI_PHISH                             3.995 3.334 3.995 3.334
+score URI_PHP_REDIR                         3.496 3.496 3.496 3.496
+score URI_TRY_3LD                           1.937 1.997 1.937 1.997
 score URI_TRY_USME                          1.000 1.000 1.000 1.000
-score URI_WPADMIN                           2.699 2.397 2.699 2.397
+score URI_WPADMIN                           2.596 2.397 2.596 2.397
 score URI_WP_DIRINDEX                       1.000 1.000 1.000 1.000
-score URI_WP_HACKED                         1.000 0.001 1.000 0.001
-score URI_WP_HACKED_2                       2.499 2.497 2.499 2.497
+score URI_WP_HACKED                         1.000 0.040 1.000 0.040
+score URI_WP_HACKED_2                       2.497 2.497 2.497 2.497
 score USB_DRIVES                            1.000 1.000 1.000 1.000
-score VFY_ACCT_NORDNS                       0.400 2.061 0.400 2.061
+score USER_IN_DKIM_WELCOMELIST              0.001 0.001 0.001 0.001
+score VFY_ACCT_NORDNS                       2.516 2.061 2.516 2.061
 score VPS_NO_NTLD                           1.000 1.000 1.000 1.000
-score WALMART_IMG_NOT_RCVD_WAL              1.887 1.682 1.887 1.682
-score WANT_TO_ORDER                         2.750 2.426 2.750 2.426
+score WALMART_IMG_NOT_RCVD_WAL              1.681 2.464 1.681 2.464
+score WANT_TO_ORDER                         2.746 2.225 2.746 2.225
 score WORD_INVIS                            1.000 1.000 1.000 1.000
-score WORD_INVIS_MANY                       2.400 2.996 2.400 2.996
-score XFER_LOTSA_MONEY                      0.999 0.998 0.999 0.998
-score XM_DIGITS_ONLY                        0.368 0.001 0.368 0.001
-score XM_RANDOM                             2.500 0.936 2.500 0.936
-score XM_RECPTID                            2.999 2.996 2.999 2.996
+score WORD_INVIS_MANY                       2.399 2.996 2.399 2.996
+score XFER_LOTSA_MONEY                      0.741 0.998 0.741 0.998
+score XM_DIGITS_ONLY                        0.551 0.001 0.551 0.001
+score XM_RANDOM                             2.497 0.947 2.497 0.947
+score XM_RECPTID                            2.996 2.996 2.996 2.996
 score XPRIO                                 1.000 1.000 1.000 1.000
 score XPRIO_SHORT_SUBJ                      1.000 1.000 1.000 1.000
-score XPRIO_URL_SHORTNER                    0.999 0.998 0.999 0.998
-score YOUR_DELIVERY_ADDRESS                 0.037 0.308 0.037 0.308
-score YOU_INHERIT                           2.699 2.127 2.699 2.127
+score XPRIO_URL_SHORTNER                    0.998 0.998 0.998 0.998
+score YOUR_DELIVERY_ADDRESS                 0.034 0.290 0.034 0.290
+score YOU_INHERIT                           2.514 1.060 2.514 1.060
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index 4e1e033..da5695c 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,228 +1,235 @@
-# Using score set 0 logs for revision 1891823 from:
-# ham-darxus.r1891823.log ham-ena-week0.r1891823.log ham-ena-week1.r1891823.log ham-ena-week2.r1891823.log ham-ena-week3.r1891823.log ham-ena-week4.r1891823.log ham-giovanni-ham.r1891823.log ham-giovanni-spammy.r1891823.log ham-giovanni-spam.r1891823.log ham-grenier.r1891823.log ham-hege.r1891823.log ham-llanga.r1891823.log ham-mmiroslaw-mails-ham.r1891823.log ham-mmiroslaw-mails-spam.r1891823.log ham-pds.r1891823.log ham-spamsponge.r1891823.log ham-thendrikx.r1891823.log ham-tsz-spam-corpus.r1891823.log spam-darxus.r1891823.log spam-ena-week0.r1891823.log spam-ena-week1.r1891823.log spam-ena-week2.r1891823.log spam-ena-week3.r1891823.log spam-ena-week4.r1891823.log spam-giovanni-ham.r1891823.log spam-giovanni-spammy.r1891823.log spam-giovanni-spam.r1891823.log spam-grenier.r1891823.log spam-hege.r1891823.log spam-llanga.r1891823.log spam-mmiroslaw-mails-ham.r1891823.log spam-mmiroslaw-mails-spam.r1891823.log spam-pds.r1891823.log spam-spamsponge.r1891823.log spam-thendrikx.r1891823.log spam-tsz-spam-corpus.r1891823.log
+# Using score set 0 logs for revision 1891844 from:
+# ham-darxus.r1891844.log ham-ena-week0.r1891844.log ham-ena-week1.r1891844.log ham-ena-week2.r1891844.log ham-ena-week3.r1891844.log ham-ena-week4.r1891844.log ham-giovanni-ham.r1891844.log ham-giovanni-spammy.r1891844.log ham-giovanni-spam.r1891844.log ham-grenier.r1891844.log ham-hege.r1891844.log ham-llanga.r1891844.log ham-mmiroslaw-mails-ham.r1891844.log ham-mmiroslaw-mails-spam.r1891844.log ham-pds.r1891844.log ham-spamsponge.r1891844.log ham-thendrikx.r1891844.log ham-tsz-spam-corpus.r1891844.log spam-darxus.r1891844.log spam-ena-week0.r1891844.log spam-ena-week1.r1891844.log spam-ena-week2.r1891844.log spam-ena-week3.r1891844.log spam-ena-week4.r1891844.log spam-giovanni-ham.r1891844.log spam-giovanni-spammy.r1891844.log spam-giovanni-spam.r1891844.log spam-grenier.r1891844.log spam-hege.r1891844.log spam-llanga.r1891844.log spam-mmiroslaw-mails-ham.r1891844.log spam-mmiroslaw-mails-spam.r1891844.log spam-pds.r1891844.log spam-spamsponge.r1891844.log spam-thendrikx.r1891844.log spam-tsz-spam-corpus.r1891844.log
 
-score ACCT_PHISHING_MANY             2.999
+score ACCT_PHISHING_MANY             2.996
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
-score AC_FROM_MANY_DOTS              2.999
-score AC_HTML_NONSENSE_TAGS          1.899
-score ADMITS_SPAM                    3.599
-score ADVANCE_FEE_2_NEW_FORM         1.569
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.500
-score ADVANCE_FEE_2_NEW_MONEY        1.090
-score ADVANCE_FEE_3_NEW              3.500
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.561
-score ADVANCE_FEE_3_NEW_MONEY        2.533
-score ADVANCE_FEE_4_NEW              2.599
-score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        0.490
-score ADVANCE_FEE_5_NEW              2.699
-score ADVANCE_FEE_5_NEW_FRM_MNY      0.536
-score ADVANCE_FEE_5_NEW_MONEY        0.052
-score AD_PREFS                       0.030
-score ALIBABA_IMG_NOT_RCVD_ALI       2.499
-score AMAZON_IMG_NOT_RCVD_AMZN       2.499
-score APP_DEVELOPMENT_NORDNS         1.586
+score AC_FROM_MANY_DOTS              2.996
+score AC_HTML_NONSENSE_TAGS          1.897
+score ADMITS_SPAM                    3.595
+score ADVANCE_FEE_2_NEW_FORM         0.001
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
+score ADVANCE_FEE_2_NEW_MONEY        1.997
+score ADVANCE_FEE_3_NEW              3.066
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.811
+score ADVANCE_FEE_3_NEW_MONEY        2.083
+score ADVANCE_FEE_4_NEW              2.696
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.464
+score ADVANCE_FEE_4_NEW_MONEY        0.488
+score ADVANCE_FEE_5_NEW              2.796
+score ADVANCE_FEE_5_NEW_FRM_MNY      1.578
+score ADVANCE_FEE_5_NEW_MONEY        0.001
+score AD_PREFS                       0.095
+score ALIBABA_IMG_NOT_RCVD_ALI       2.497
+score AMAZON_IMG_NOT_RCVD_AMZN       1.645
+score APP_DEVELOPMENT_NORDNS         1.997
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.904
-score BIGNUM_EMAILS_FREEM            2.999
-score BIGNUM_EMAILS_MANY             2.772
-score BITCOIN_MALF_HTML              3.499
-score BITCOIN_ONAN                   2.999
-score BITCOIN_SPAM_02                2.253
-score BITCOIN_SPAM_03                2.499
-score BITCOIN_SPAM_07                3.499
-score BITCOIN_XPRIO                  0.001
-score BITCOIN_YOUR_INFO              2.999
-score BOGUS_MIME_VERSION             3.499
-score BOGUS_MSM_HDRS                 1.691
-score BULK_RE_SUSP_NTLD              0.999
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.812
+score BEBEE_IMG_NOT_RCVD_BB          1.656
+score BIGNUM_EMAILS_FREEM            2.996
+score BIGNUM_EMAILS_MANY             2.996
+score BITCOIN_MALF_HTML              3.497
+score BITCOIN_ONAN                   2.996
+score BITCOIN_SPAM_02                1.857
+score BITCOIN_SPAM_03                2.497
+score BITCOIN_SPAM_07                3.497
+score BITCOIN_XPRIO                  0.001 # force non-zero
+score BITCOIN_YOUR_INFO              2.996
+score BOGUS_MIME_VERSION             3.496
+score BOGUS_MSM_HDRS                 1.300
+score BULK_RE_SUSP_NTLD              0.998
 score CK_HELO_GENERIC                0.249
-score CONTENT_AFTER_HTML             2.499
-score CTE_8BIT_MISMATCH              0.999
-score DEAR_BENEFICIARY               1.532
-score DETAILS_OF_PRODUCT             1.249
-score DX_TEXT_03                     0.900
-score EBAY_IMG_NOT_RCVD_EBAY         0.243
-score ENCRYPTED_MESSAGE              -0.906
-score FACEBOOK_IMG_NOT_RCVD_FB       1.999
-score FAKE_REPLY_A1                  4.000
-score FAKE_REPLY_B                   3.900
+score CONTENT_AFTER_HTML             2.497
+score CTE_8BIT_MISMATCH              0.998
+score DEAR_BENEFICIARY               3.096
+score DETAILS_OF_PRODUCT             1.248
+score DX_TEXT_03                     0.899
+score EBAY_IMG_NOT_RCVD_EBAY         0.882
+score ENCRYPTED_MESSAGE              -0.898
+score FACEBOOK_IMG_NOT_RCVD_FB       1.997
+score FAKE_REPLY_A1                  3.995
+score FAKE_REPLY_B                   3.895
 score FILL_THIS_FORM                 1.198
-score FONT_INVIS_DIRECT              2.399
-score FONT_INVIS_DOTGOV              3.499
-score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               2.499
-score FONT_INVIS_NORDNS              2.087
+score FONT_INVIS_DIRECT              2.395
+score FONT_INVIS_DOTGOV              3.497
+score FONT_INVIS_HTML_NOHTML         2.996
+score FONT_INVIS_LONG_LINE           2.996
+score FONT_INVIS_MSGID               2.497
+score FONT_INVIS_NORDNS              2.123
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.250
-score FROMSPACE                      3.200
-score FROM_2_EMAILS_SHORT            2.650
-score FROM_IN_TO_AND_SUBJ            2.499
-score FROM_MISSPACED                 0.001
-score FROM_MISSP_EH_MATCH            0.001 # force non-zero
-score FROM_MISSP_FREEMAIL            2.502
+score FOUND_YOU                      3.246
+score FREEMAIL_FORGED_FROMDOMAIN     0.249
+score FROMSPACE                      3.096
+score FROM_2_EMAILS_SHORT            2.568
+score FROM_IN_TO_AND_SUBJ            2.498
+score FROM_MISSPACED                 1.891
+score FROM_MISSP_DYNIP               0.001
+score FROM_MISSP_EH_MATCH            0.001
+score FROM_MISSP_FREEMAIL            2.500
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.499
+score FROM_MISSP_PHISH               3.496
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              0.354
-score FROM_NAME_EQ_TO_G_DRIVE        0.385
-score FROM_NTLD_REPLY_FREEMAIL       1.999
-score FROM_SUSPICIOUS_NTLD           0.500
-score FROM_SUSPICIOUS_NTLD_FP        1.999
-score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  3.100
+score FROM_MULTI_NORDNS              0.353
+score FROM_NAME_EQ_TO_G_DRIVE        0.402
+score FROM_NTLD_REPLY_FREEMAIL       1.579
+score FROM_SUSPICIOUS_NTLD           0.498
+score FROM_SUSPICIOUS_NTLD_FP        1.998
+score FSL_CTYPE_WIN1251              0.001 # force non-zero
+score FSL_HELO_FAKE                  3.096
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.399
+score FUZZY_AMAZON                   2.497
 score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
-score GOOGLE_DOC_SUSP                2.501
-score GOOG_REDIR_NORDNS              2.600
-score GOOG_STO_EMAIL_PHISH           2.618
-score GOOG_STO_HTML_PHISH            2.543
-score GOOG_STO_HTML_PHISH_MANY       2.386
-score GOOG_STO_IMG_HTML              2.999
-score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       1.999
-score HDRS_LCASE_IMGONLY             0.099
-score HDRS_MISSP                     1.881
-score HDR_ORDER_FTSDMCXX_DIRECT      1.089
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
+score GOOGLE_DOC_SUSP                2.495
+score GOOG_REDIR_NORDNS              3.399
+score GOOG_STO_EMAIL_PHISH           2.293
+score GOOG_STO_HTML_PHISH            2.061
+score GOOG_STO_HTML_PHISH_MANY       3.216
+score GOOG_STO_IMG_HTML              2.996
+score GOOG_STO_NOIMG_HTML            2.996
+score HAS_X_OUTGOING_SPAM_STAT       1.997
+score HDRS_LCASE_IMGONLY             0.098
+score HDRS_MISSP                     1.693
+score HDR_ORDER_FTSDMCXX_DIRECT      1.348
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.250
-score HELO_NO_DOMAIN                 0.001
-score HK_NAME_FM_MR_MRS              1.499
-score HK_NAME_MR_MRS                 1.000
-score HK_RANDOM_ENVFROM              1.000
-score HK_RANDOM_FROM                 1.000
-score HK_RANDOM_REPLYTO              0.999
-score HK_SCAM                        0.543
-score HOSTED_IMG_DIRECT_MX           1.859
-score HOSTED_IMG_FREEM               3.499
-score HOSTED_IMG_MULTI               2.015
-score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_OFF_PAGE                  2.999
-score HTML_TAG_BALANCE_CENTER        1.703
-score HTML_TEXT_INVISIBLE_STYLE      2.481
-score JH_SPAMMY_HEADERS              3.499
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.499
-score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   0.884
-score LONG_INVISIBLE_TEXT            1.768
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
+score HELO_NO_DOMAIN                 0.001 # force non-zero
+score HK_NAME_FM_MR_MRS              1.498
+score HK_NAME_MR_MRS                 0.998
+score HK_RANDOM_ENVFROM              0.998
+score HK_RANDOM_FROM                 0.998
+score HK_RANDOM_REPLYTO              0.998
+score HK_SCAM                        0.483
+score HOSTED_IMG_DIRECT_MX           1.768
+score HOSTED_IMG_FREEM               3.497
+score HOSTED_IMG_MULTI               1.092
+score HOSTED_IMG_MULTI_PUB_01        2.997
+score HTML_ENTITY_ASCII              2.999
+score HTML_OFF_PAGE                  2.996
+score HTML_TAG_BALANCE_CENTER        2.097
+score HTML_TEXT_INVISIBLE_STYLE      2.083
+score IMG_ONLY_FM_DOM_INFO           1.275
+score JH_SPAMMY_HEADERS              3.496
+score LINKEDIN_IMG_NOT_RCVD_LNKN     2.497
+score LONG_HEX_URI                   2.996
+score LONG_IMG_URI                   0.890
+score LONG_INVISIBLE_TEXT            1.735
 score LOTS_OF_MONEY                  0.010
-score MALWARE_NORDNS                 2.102
-score MANY_SPAN_IN_TEXT              2.399
-score MILLION_HUNDRED                3.199
-score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           1.013
-score MIXED_AREA_CASE                1.377
-score MIXED_CENTER_CASE              2.499
-score MIXED_ES                       3.000
-score MIXED_FONT_CASE                1.093
-score MIXED_HREF_CASE                1.374
-score MIXED_IMG_CASE                 0.300
-score MONEY_ATM_CARD                 2.899
-score MONEY_FORM                     0.074
-score MONEY_FORM_SHORT               1.250
+score LOTTO_AGENT                    0.986
+score LOTTO_DEPT                     1.997
+score MALWARE_NORDNS                 2.103
+score MANY_SPAN_IN_TEXT              2.397
+score MILLION_HUNDRED                3.196
+score MILLION_USD                    0.216
+score MIMEOLE_DIRECT_TO_MX           0.553
+score MIXED_AREA_CASE                1.547
+score MIXED_CENTER_CASE              1.630
+score MIXED_ES                       2.997
+score MIXED_FONT_CASE                1.342
+score MIXED_HREF_CASE                1.896
+score MIXED_IMG_CASE                 2.570
+score MONEY_ATM_CARD                 1.911
+score MONEY_FORM                     0.001
+score MONEY_FORM_SHORT               1.239
 score MONEY_FRAUD_3                  0.001
-score MONEY_FRAUD_5                  0.655
-score MONEY_FRAUD_8                  0.406
-score MONEY_FREEMAIL_REPTO           2.999
-score MONEY_FROM_41                  1.999
+score MONEY_FRAUD_5                  0.657
+score MONEY_FRAUD_8                  0.785
+score MONEY_FREEMAIL_REPTO           2.996
+score MONEY_FROM_41                  1.997
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.554
-score MSGID_WSP_TRAIL                0.927
-score MSMAIL_PRI_ABNORMAL            0.001
-score NAME_EMAIL_DIFF                1.850
-score NA_DOLLARS                     1.434
-score NEW_PRODUCTS                   1.249
-score NICE_REPLY_A                   -1.718
-score NOT_SPAM                       3.299
-score NO_FM_NAME_IP_HOSTN            0.198
+score MONEY_NOHTML                   1.671
+score MSGID_WSP_TRAIL                1.062
+score MSMAIL_PRI_ABNORMAL            0.314
+score NAME_EMAIL_DIFF                1.917
+score NA_DOLLARS                     0.829
+score NEW_PRODUCTS                   1.248
+score NICE_REPLY_A                   -0.246
+score NOT_SPAM                       3.296
+score NO_FM_NAME_IP_HOSTN            0.288
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.343
+score NUMBEREND_LINKBAIT             0.999
 score OBFU_TEXT_ATTACH               0.001
-score ODD_FREEM_REPTO                2.999
-score OFFER_ONLY_AMERICA             0.828
-score ONLINE_MKTG_CNSLT              2.600
-score ORDER_TODAY                    1.035
-score PDS_BTC_ID                     0.499
+score ODD_FREEM_REPTO                2.996
+score OFFER_ONLY_AMERICA             1.650
+score ONLINE_MKTG_CNSLT              2.596
+score ORDER_TODAY                    1.569
+score PDS_BTC_ID                     0.498
 score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   1.999
-score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_FRNOM_TODOM_DBL_URL        1.490
-score PDS_FRNOM_TODOM_NAKED_TO       1.499
-score PDS_FROM_2_EMAILS_SHRTNER      1.499
-score PDS_FROM_NAME_TO_DOMAIN        1.999
-score PDS_HP_HELO_NORDNS             0.999
-score PDS_OTHER_BAD_TLD              1.999
-score PDS_PHP_EVAL                   1.499
+score PDS_BTC_NTLD                   1.923
+score PDS_DBL_URL_TNB_RUNON          1.997
+score PDS_FRNOM_TODOM_DBL_URL        1.499
+score PDS_FRNOM_TODOM_NAKED_TO       1.498
+score PDS_FROM_2_EMAILS_SHRTNER      1.013
+score PDS_FROM_NAME_TO_DOMAIN        1.997
+score PDS_HP_HELO_NORDNS             0.998
+score PDS_OTHER_BAD_TLD              1.997
+score PDS_PHP_EVAL                   1.498
 score PDS_RDNS_DYNAMIC_FP            0.001 # force non-zero
-score PDS_SHORTFWD_URISHRT_FP        1.499
+score PDS_SHORTFWD_URISHRT_FP        1.498
 score PDS_TINYSUBJ_URISHRT           1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_TO_EQ_FROM_NAME            3.099
-score PHP_ORIG_SCRIPT                2.407
-score PHP_ORIG_SCRIPT_EVAL           3.000
-score PHP_SCRIPT                     2.499
-score PP_MIME_FAKE_ASCII_TEXT        0.999
-score RAND_HEADER_LIST_SPOOF         2.999
-score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                2.760
-score RDNS_NUM_TLD_XM                2.012
-score READY_TO_SHIP                  1.249
-score REPLYTO_EMPTY                  2.400
-score REPTO_419_FRAUD                1.921
-score REPTO_419_FRAUD_GM             2.999
-score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      3.099
-score SCC_NEWBIE_HASBEENS            1.728
-score SENDGRID_REDIR                 1.499
-score SERGIO_SUBJECT_VIAGRA01        2.894
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.500
-score SHORTENER_SHORT_IMG            2.330
-score SHORT_SHORTNER                 1.999
-score STATIC_XPRIO_OLE               1.191
-score TAGSTAT_IMG_NOT_RCVD_TGST      1.999
-score THIS_AD                        1.299
-score THIS_IS_ADV_SUSP_NTLD          0.602
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
+score PDS_TO_EQ_FROM_NAME            3.196
+score PHP_ORIG_SCRIPT                2.249
+score PHP_ORIG_SCRIPT_EVAL           2.996
+score PHP_SCRIPT                     2.497
+score PP_MIME_FAKE_ASCII_TEXT        0.998
+score RAND_HEADER_LIST_SPOOF         2.996
+score RAND_MKTG_HEADER               1.997
+score RATWARE_NO_RDNS                1.892
+score RDNS_NUM_TLD_XM                1.628
+score READY_TO_SHIP                  1.248
+score REPLYTO_EMPTY                  2.397
+score REPTO_419_FRAUD                2.938
+score REPTO_419_FRAUD_GM             2.996
+score REPTO_419_FRAUD_GM_LOOSE       0.998
+score RISK_FREE                      3.096
+score SCC_NEWBIE_HASBEENS            1.717
+score SENDGRID_REDIR                 1.498
+score SERGIO_SUBJECT_VIAGRA01        3.095
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
+score SHORTENER_SHORT_IMG            0.973
+score SHORT_SHORTNER                 1.997
+score STATIC_XPRIO_OLE               1.552
+score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
+score TARINGANET_IMG_NOT_RCVD_TN     1.999
+score THIS_AD                        1.298
+score THIS_IS_ADV_SUSP_NTLD          1.477
 score TO_EQ_FM_DIRECT_MX             0.001 # force non-zero
-score TO_IN_SUBJ                     0.099
-score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.999
-score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_NORDNS_HTML        2.000
-score TO_NO_BRKTS_PCNT               2.499
-score TRANSFORM_LIFE                 2.499
-score TVD_PH_BODY_META               3.100
-score TVD_RCVD_SPACE_BRACKET         2.799
-score UNDISC_FREEM                   2.999
-score UNDISC_MONEY                   3.399
-score URI_DEOBFU_INSTR               4.399
-score URI_DOTEDU                     1.999
-score URI_DQ_UNSUB                   2.499
-score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               3.099
-score URI_GOOG_STO_SPAMMY            2.999
-score URI_LONG_REPEAT                2.499
-score URI_PHISH                      4.000
-score URI_PHP_REDIR                  3.499
-score URI_TRY_3LD                    1.999
-score URI_WPADMIN                    2.699
-score URI_WP_HACKED_2                2.499
-score VFY_ACCT_NORDNS                0.400
-score WALMART_IMG_NOT_RCVD_WAL       1.887
-score WANT_TO_ORDER                  2.750
-score WORD_INVIS_MANY                2.400
-score XFER_LOTSA_MONEY               0.999
-score XM_DIGITS_ONLY                 0.368
-score XM_RANDOM                      2.500
-score XM_RECPTID                     2.999
-score XPRIO_URL_SHORTNER             0.999
-score YOUR_DELIVERY_ADDRESS          0.037
-score YOU_INHERIT                    2.699
+score TO_IN_SUBJ                     0.098
+score TO_NO_BRKTS_FROM_MSSP          2.497
+score TO_NO_BRKTS_HTML_IMG           1.997
+score TO_NO_BRKTS_HTML_ONLY          1.997
+score TO_NO_BRKTS_NORDNS_HTML        1.997
+score TO_NO_BRKTS_PCNT               2.498
+score TRANSFORM_LIFE                 2.497
+score TVD_PH_BODY_META               3.096
+score TVD_RCVD_SPACE_BRACKET         2.797
+score UNDISC_FREEM                   3.096
+score UNDISC_MONEY                   3.396
+score URI_DEOBFU_INSTR               4.395
+score URI_DOTEDU                     1.997
+score URI_DQ_UNSUB                   2.497
+score URI_FIREBASEAPP                2.996
+score URI_GOOGLE_PROXY               3.096
+score URI_GOOG_STO_SPAMMY            2.996
+score URI_LONG_REPEAT                2.497
+score URI_PHISH                      3.995
+score URI_PHP_REDIR                  3.496
+score URI_TRY_3LD                    1.937
+score URI_WPADMIN                    2.596
+score URI_WP_HACKED_2                2.497
+score VFY_ACCT_NORDNS                2.516
+score WALMART_IMG_NOT_RCVD_WAL       1.681
+score WANT_TO_ORDER                  2.746
+score WORD_INVIS_MANY                2.399
+score XFER_LOTSA_MONEY               0.741
+score XM_DIGITS_ONLY                 0.551
+score XM_RANDOM                      2.497
+score XM_RECPTID                     2.996
+score XPRIO_URL_SHORTNER             0.998
+score YOUR_DELIVERY_ADDRESS          0.034
+score YOU_INHERIT                    2.514
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -235,7 +242,6 @@
 score AC_SPAMMY_URI_PATTERNS9        1.000
 score ADULT_DATING_COMPANY           10.001 # force non-zero
 score APP_DEVELOPMENT_FREEM          1.000
-score BEBEE_IMG_NOT_RCVD_BB          1.000
 score BITCOIN_BOMB                   1.000
 score BITCOIN_DEADLINE               1.000
 score BITCOIN_EXTORT_01              1.000
@@ -272,6 +278,7 @@
 score FREEM_FRNUM_UNICD_EMPTY        1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB     1.000
 score FROM_ADDR_WS                   1.000
+score FROM_MISSP_REPLYTO             1.000
 score FROM_NTLD_LINKBAIT             1.000
 score FROM_NUMERIC_TLD               1.000
 score GAPPY_SALES_LEADS_FREEM        1.000
@@ -290,21 +297,19 @@
 score HK_RCVD_IP_MULTICAST           1.000
 score HK_WIN                         1.000
 score HOSTED_IMG_DQ_UNSUB            1.000
-score HTML_ENTITY_ASCII              1.000
 score HTML_ENTITY_ASCII_TINY         1.000
 score HTML_SHRT_CMNT_OBFU_MANY       1.000
 score HTML_SINGLET_MANY              1.000
 score HTML_TEXT_INVISIBLE_FONT       1.000
-score IMG_ONLY_FM_DOM_INFO           1.000
 score JH_SPAMMY_PATTERN01            1.000
 score JH_SPAMMY_PATTERN02            1.000
 score KHOP_HELO_FCRDNS               0.400
 score LIST_PRTL_PUMPDUMP             1.000
 score LIST_PRTL_SAME_USER            1.000
-score LOTTO_AGENT                    1.000
 score LUCRATIVE                      1.000
 score MALF_HTML_B64                  1.000
 score MALWARE_PASSWORD               1.000
+score MANY_HDRS_LCASE                0.100
 score MIME_NO_TEXT                   1.000
 score MONERO_DEADLINE                1.000
 score MONERO_EXTORT_01               1.000
@@ -315,7 +320,6 @@
 score MSM_PRIO_REPTO                 1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
-score PDS_FROM_2_EMAILS              1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHISH_FBASEAPP                 1.000
 score PHOTO_EDITING_DIRECT           1.000
@@ -350,10 +354,11 @@
 score STOCK_TIP                      1.000
 score SUBJ_BRKN_WORDNUMS             1.000
 score SYSADMIN                       1.000
-score TARINGANET_IMG_NOT_RCVD_TN     1.000
 score TONLINE_FAKE_DKIM              1.000
 score TO_NAME_SUBJ_NO_RDNS           1.000
+score TO_NO_BRKTS_MSFT               1.000
 score TVD_SPACE_ENCODED              1.000
+score TVD_SPACE_RATIO_MINFP          1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ASC               1.000
@@ -415,3 +420,4 @@
 score SURBL_BLOCKED                  0.001 # force non-zero
 score TO_EQ_FM_DOM_SPF_FAIL          0.001 # force non-zero
 score TO_EQ_FM_SPF_FAIL              0.001 # force non-zero
+score USER_IN_DKIM_WELCOMELIST       0.001 # force non-zero
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index 84f495c..87dda29 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -7,168 +7,168 @@
 score AC_FROM_MANY_DOTS              2.996
 score AC_HTML_NONSENSE_TAGS          1.997
 score ADMITS_SPAM                    3.396
-score ADVANCE_FEE_2_NEW_FORM         1.361
+score ADVANCE_FEE_2_NEW_FORM         0.471
 score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
 score ADVANCE_FEE_2_NEW_MONEY        0.001
-score ADVANCE_FEE_3_NEW              3.408
+score ADVANCE_FEE_3_NEW              3.407
 score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_3_NEW_MONEY        0.981
+score ADVANCE_FEE_3_NEW_MONEY        0.982
 score ADVANCE_FEE_4_NEW              2.397
-score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW              2.497
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_5_NEW_MONEY        0.001
 score AD_PREFS                       0.498
-score ALIBABA_IMG_NOT_RCVD_ALI       1.351
+score ALIBABA_IMG_NOT_RCVD_ALI       0.163
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         0.442
+score APP_DEVELOPMENT_NORDNS         0.205
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.722
-score BIGNUM_EMAILS_FREEM            2.144
+score BIGNUM_EMAILS_FREEM            2.033
 score BITCOIN_MALF_HTML              3.496
 score BITCOIN_MALWARE                0.001
-score BITCOIN_ONAN                   2.997
-score BITCOIN_SPAM_02                1.248
-score BITCOIN_SPAM_03                2.153
+score BITCOIN_ONAN                   2.996
+score BITCOIN_SPAM_02                1.326
+score BITCOIN_SPAM_03                1.532
 score BITCOIN_SPAM_05                2.497
-score BITCOIN_SPAM_07                3.092
-score BITCOIN_XPRIO                  0.223
-score BITCOIN_YOUR_INFO              2.305
+score BITCOIN_SPAM_07                3.089
+score BITCOIN_XPRIO                  0.149
+score BITCOIN_YOUR_INFO              2.308
 score BODY_URI_ONLY                  0.001
-score BOGUS_MIME_VERSION             3.183
+score BOGUS_MIME_VERSION             3.278
 score CK_HELO_GENERIC                0.008
-score CONTENT_AFTER_HTML             2.417
+score CONTENT_AFTER_HTML             2.418
 score CTE_8BIT_MISMATCH              0.001
 score DEAR_BENEFICIARY               2.896
 score DETAILS_OF_PRODUCT             1.248
-score DKIMWL_BL                      2.313
-score DKIMWL_WL_HIGH                 -0.719
+score DKIMWL_BL                      2.334
+score DKIMWL_WL_HIGH                 -0.717
 score DKIMWL_WL_MED                  -0.001
-score DKIMWL_WL_MEDHI                -0.672
+score DKIMWL_WL_MEDHI                -0.275
 score DX_TEXT_03                     0.698
-score DYNAMIC_IMGUR                  3.815
-score EBAY_IMG_NOT_RCVD_EBAY         1.130
+score DYNAMIC_IMGUR                  2.851
+score EBAY_IMG_NOT_RCVD_EBAY         1.666
 score ENCRYPTED_MESSAGE              -0.998
 score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  3.611
+score FAKE_REPLY_A1                  2.642
 score FAKE_REPLY_B                   3.695
-score FILL_THIS_FORM                 0.001
+score FILL_THIS_FORM                 0.001 # force non-zero
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_DOTGOV              3.496
 score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_LONG_LINE           2.996
-score FONT_INVIS_MSGID               1.843
-score FONT_INVIS_NORDNS              2.300
+score FONT_INVIS_MSGID               1.842
+score FONT_INVIS_NORDNS              1.749
 score FORGED_SPF_HELO                1.597
-score FORM_FRAUD                     0.001 # force non-zero
+score FORM_FRAUD                     0.001
 score FORM_FRAUD_3                   2.596
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      0.302
-score FREEMAIL_FORGED_FROMDOMAIN     0.248
-score FROMSPACE                      2.534
+score FOUND_YOU                      1.913
+score FREEMAIL_FORGED_FROMDOMAIN     0.249
+score FROMSPACE                      2.595
 score FROM_2_EMAILS_SHORT            2.996
 score FROM_BANK_NOAUTH               0.998
 score FROM_FMBLA_NEWDOM              1.498
 score FROM_FMBLA_NEWDOM14            0.998
-score FROM_FMBLA_NEWDOM28            0.799
-score FROM_GOV_DKIM_AU               -0.736
+score FROM_FMBLA_NEWDOM28            0.798
+score FROM_GOV_DKIM_AU               -0.752
 score FROM_GOV_SPOOF                 0.001
 score FROM_MISSPACED                 0.001
+score FROM_MISSP_DYNIP               2.197
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            0.001 # force non-zero
+score FROM_MISSP_FREEMAIL            0.001
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_PHISH               3.496
+score FROM_MISSP_REPLYTO             0.001
 score FROM_MISSP_SPF_FAIL            0.001
-score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              2.093
-score FROM_NAME_EQ_TO_G_DRIVE        0.465
-score FROM_NTLD_REPLY_FREEMAIL       0.594
-score FROM_PAYPAL_SPOOF              0.001 # force non-zero
-score FROM_SUSPICIOUS_NTLD           0.498
-score FROM_SUSPICIOUS_NTLD_FP        1.025
-score FSL_BULK_SIG                   2.620
+score FROM_MISSP_USER                0.001 # force non-zero
+score FROM_MULTI_NORDNS              2.346
+score FROM_NAME_EQ_TO_G_DRIVE        0.001
+score FROM_NTLD_REPLY_FREEMAIL       1.121
+score FROM_PAYPAL_SPOOF              0.001
+score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_SUSPICIOUS_NTLD_FP        1.099
+score FSL_BULK_SIG                   2.617
 score FSL_CTYPE_WIN1251              0.001
 score FSL_HELO_FAKE                  2.896
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.198
+score FUZZY_AMAZON                   2.197
 score GB_FAKE_RF_SHORT               1.997
-score GB_FREEMAIL_DISPTO             0.499
+score GB_FREEMAIL_DISPTO             0.498
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
 score GOOGLE_DOC_SUSP                2.996
 score GOOG_REDIR_NORDNS              2.996
-score GOOG_STO_EMAIL_PHISH           2.727
-score GOOG_STO_HTML_PHISH            1.177
-score GOOG_STO_HTML_PHISH_MANY       3.326
-score GOOG_STO_IMG_HTML              2.997
+score GOOG_STO_EMAIL_PHISH           2.563
+score GOOG_STO_HTML_PHISH            2.424
+score GOOG_STO_HTML_PHISH_MANY       1.648
+score GOOG_STO_IMG_HTML              2.996
 score GOOG_STO_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       0.793
-score HDRS_LCASE                     0.099
-score HDRS_LCASE_IMGONLY             0.093
+score HAS_X_OUTGOING_SPAM_STAT       1.025
+score HDRS_LCASE                     0.098
+score HDRS_LCASE_IMGONLY             0.001 # force non-zero
 score HDRS_MISSP                     0.001
-score HDR_ORDER_FTSDMCXX_DIRECT      0.001 # force non-zero
-score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
+score HDR_ORDER_FTSDMCXX_DIRECT      0.001
+score HDR_ORDER_FTSDMCXX_NORDNS      0.001 # force non-zero
+score HEADER_FROM_DIFFERENT_DOMAINS  0.248
 score HELO_NO_DOMAIN                 0.001
-score HK_NAME_FM_MR_MRS              0.542
-score HK_NAME_MR_MRS                 0.086
+score HK_NAME_FM_MR_MRS              0.749
+score HK_NAME_MR_MRS                 0.218
 score HK_RANDOM_ENVFROM              0.998
-score HK_RANDOM_FROM                 0.999
-score HK_RANDOM_REPLYTO              0.586
+score HK_RANDOM_FROM                 0.998
+score HK_RANDOM_REPLYTO              0.395
 score HK_SCAM                        0.001
-score HOSTED_IMG_DIRECT_MX           2.505
+score HOSTED_IMG_DIRECT_MX           1.988
 score HOSTED_IMG_FREEM               3.496
 score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_OFF_PAGE                  1.813
-score HTML_SINGLET_MANY              0.903
-score HTML_TEXT_INVISIBLE_FONT       0.028
-score HTML_TEXT_INVISIBLE_STYLE      2.020
+score HTML_OFF_PAGE                  2.663
+score HTML_SINGLET_MANY              0.998
+score HTML_TEXT_INVISIBLE_FONT       0.146
+score HTML_TEXT_INVISIBLE_STYLE      2.084
 score JH_SPAMMY_HEADERS              3.496
+score KHOP_FAKE_EBAY                 1.099
 score KHOP_HELO_FCRDNS               0.398
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.079
-score LONG_HEX_URI                   0.942
-score LONG_IMG_URI                   0.933
-score LONG_INVISIBLE_TEXT            0.156
+score LINKEDIN_IMG_NOT_RCVD_LNKN     2.499
+score LONG_HEX_URI                   0.948
+score LONG_IMG_URI                   0.943
+score LONG_INVISIBLE_TEXT            0.171
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    1.498
-score MALWARE_NORDNS                 0.443
+score MALWARE_NORDNS                 0.352
 score MANY_SPAN_IN_TEXT              2.297
 score MILLION_HUNDRED                2.896
 score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           0.231
-score MIXED_AREA_CASE                2.442
-score MIXED_CENTER_CASE              1.034
-score MIXED_ES                       2.597
-score MIXED_FONT_CASE                1.309
-score MIXED_HREF_CASE                0.801
-score MIXED_IMG_CASE                 0.756
+score MIMEOLE_DIRECT_TO_MX           0.320
+score MIXED_AREA_CASE                0.641
+score MIXED_CENTER_CASE              2.164
+score MIXED_ES                       2.598
+score MIXED_FONT_CASE                1.594
+score MIXED_HREF_CASE                0.606
+score MIXED_IMG_CASE                 1.623
 score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
+score MONEY_FORM                     0.001
 score MONEY_FORM_SHORT               0.001
 score MONEY_FRAUD_3                  0.001
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.216
+score MONEY_FREEMAIL_REPTO           1.329
 score MONEY_FROM_41                  1.997
-score MONEY_FROM_MISSP               0.001 # force non-zero
-score MONEY_NOHTML                   1.117
-score MSGID_WSP_TRAIL                1.271
-score MSMAIL_PRI_ABNORMAL            0.001
-score NAME_EMAIL_DIFF                2.443
-score NA_DOLLARS                     0.451
+score MONEY_FROM_MISSP               0.001
+score MONEY_NOHTML                   0.948
+score MSGID_WSP_TRAIL                0.675
+score MSMAIL_PRI_ABNORMAL            1.179
+score NAME_EMAIL_DIFF                2.441
+score NA_DOLLARS                     0.538
 score NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.277
-score NOT_SPAM                       2.996
-score NO_FM_NAME_IP_HOSTN            0.486
-score NSL_RCVD_FROM_USER             0.001
+score NICE_REPLY_A                   -0.125
+score NOT_SPAM                       3.096
+score NO_FM_NAME_IP_HOSTN            0.491
+score NSL_RCVD_FROM_USER             0.001 # force non-zero
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.346
-score ODD_FREEM_REPTO                2.722
-score ONLINE_MKTG_CNSLT              2.297
-score ORDER_TODAY                    0.405
+score NUMBEREND_LINKBAIT             0.575
+score ODD_FREEM_REPTO                2.448
+score ONLINE_MKTG_CNSLT              2.397
+score ORDER_TODAY                    1.240
 score PDS_BTC_ID                     0.498
 score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   0.224
+score PDS_BTC_NTLD                   1.220
 score PDS_FRNOM_TODOM_DBL_URL        1.498
 score PDS_FRNOM_TODOM_NAKED_TO       1.498
 score PDS_FROM_2_EMAILS_SHRTNER      1.498
@@ -177,82 +177,84 @@
 score PDS_OTHER_BAD_TLD              1.997
 score PDS_PHP_EVAL                   1.498
 score PDS_RDNS_DYNAMIC_FP            0.001 # force non-zero
-score PDS_SHORTFWD_URISHRT_FP        1.476
-score PDS_TINYSUBJ_URISHRT           1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.593
-score PDS_TO_EQ_FROM_NAME            2.975
-score PHP_ORIG_SCRIPT                0.587
+score PDS_SHORTFWD_URISHRT_FP        1.216
+score PDS_TINYSUBJ_URISHRT           1.498
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.594
+score PDS_TO_EQ_FROM_NAME            2.590
+score PHP_ORIG_SCRIPT                0.585
 score PHP_ORIG_SCRIPT_EVAL           2.996
-score PHP_SCRIPT                     2.497
+score PHP_SCRIPT                     2.265
 score PP_MIME_FAKE_ASCII_TEXT        0.998
 score RAND_HEADER_LIST_SPOOF         2.996
 score RAND_MKTG_HEADER               1.997
-score RATWARE_NO_RDNS                2.354
-score RCVD_IN_MSPIKE_H2              -0.001 # force non-zero
-score RDNS_NUM_TLD_XM                1.994
+score RATWARE_NO_RDNS                1.647
+score RCVD_IN_MSPIKE_H2              -0.001
+score RDNS_NUM_TLD_XM                1.887
 score READY_TO_SHIP                  1.248
 score REPTO_419_FRAUD                2.999
-score REPTO_419_FRAUD_GM             2.851
+score REPTO_419_FRAUD_GM             2.715
 score REPTO_419_FRAUD_GM_LOOSE       0.998
 score RISK_FREE                      2.896
-score SCC_NEWBIE_HASBEENS            1.699
-score SENDGRID_REDIR                 1.240
-score SERGIO_SUBJECT_VIAGRA01        4.096
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.498
-score SHORTENER_SHORT_IMG            2.136
-score SHORT_SHORTNER                 0.715
-score SINGLETS_LOW_CONTRAST          2.917
-score SPOOFED_FREEMAIL               1.221
+score SCC_NEWBIE_HASBEENS            1.044
+score SENDGRID_REDIR                 1.098
+score SERGIO_SUBJECT_VIAGRA01        4.095
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
+score SHORTENER_SHORT_IMG            1.221
+score SHORT_SHORTNER                 0.676
+score SINGLETS_LOW_CONTRAST          2.718
+score SPOOFED_FREEMAIL               1.224
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            0.001
-score SPOOFED_FREEM_REPTO_CHN        3.379
+score SPOOFED_FREEM_REPTO_CHN        0.646
 score SPOOF_GMAIL_MID                1.498
 score STATIC_XPRIO_OLE               1.997
 score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
-score THIS_AD                        0.998
+score THIS_AD                        0.999
 score TO_EQ_FM_DIRECT_MX             2.497
+score TO_EQ_FM_DOM_HTML_ONLY         2.696
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
-score TO_EQ_FM_HTML_ONLY             2.297
+score TO_EQ_FM_HTML_ONLY             1.514
 score TO_EQ_FM_SPF_FAIL              0.001
 score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.637
+score TO_NAME_SUBJ_NO_RDNS           2.128
 score TO_NO_BRKTS_FROM_MSSP          0.001
-score TO_NO_BRKTS_HTML_IMG           0.071
+score TO_NO_BRKTS_HTML_IMG           0.078
 score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_NORDNS_HTML        1.204
+score TO_NO_BRKTS_MSFT               0.001
+score TO_NO_BRKTS_NORDNS_HTML        1.205
 score TO_NO_BRKTS_PCNT               2.497
 score TRANSFORM_LIFE                 2.497
 score TVD_PH_BODY_META               2.796
-score TVD_RCVD_SPACE_BRACKET         1.767
+score TVD_RCVD_SPACE_BRACKET         1.087
 score TVD_SPACE_ENCODED              0.001
+score TVD_SPACE_RATIO_MINFP          0.001
 score UNDISC_FREEM                   2.696
 score UNDISC_MONEY                   3.096
-score UPGRADE_MAILBOX                0.701
 score URI_DEOBFU_INSTR               4.195
-score URI_DOTEDU                     1.837
-score URI_DQ_UNSUB                   1.821
+score URI_DOTEDU                     1.773
+score URI_DQ_UNSUB                   1.896
 score URI_FIREBASEAPP                2.996
 score URI_GOOGLE_PROXY               2.596
 score URI_GOOG_STO_SPAMMY            2.996
-score URI_LONG_REPEAT                2.422
+score URI_LONG_REPEAT                2.351
 score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      3.310
+score URI_PHISH                      3.334
 score URI_PHP_REDIR                  3.496
 score URI_TRY_3LD                    1.997
 score URI_WPADMIN                    2.397
-score URI_WP_HACKED                  0.001
+score URI_WP_HACKED                  0.040
 score URI_WP_HACKED_2                2.497
 score VFY_ACCT_NORDNS                2.061
-score WALMART_IMG_NOT_RCVD_WAL       1.682
-score WANT_TO_ORDER                  2.426
+score WALMART_IMG_NOT_RCVD_WAL       2.464
+score WANT_TO_ORDER                  2.225
 score WORD_INVIS_MANY                2.996
 score XFER_LOTSA_MONEY               0.998
 score XM_DIGITS_ONLY                 0.001
-score XM_RANDOM                      0.936
+score XM_RANDOM                      0.947
 score XM_RECPTID                     2.996
 score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          0.308
-score YOU_INHERIT                    2.127
+score YOUR_DELIVERY_ADDRESS          0.290
+score YOU_INHERIT                    1.060
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -297,6 +299,7 @@
 score ENVFROM_GOOG_TRIX              1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000
+score FONT_INVIS_LONG_LINE           1.000
 score FONT_INVIS_POSTEXTRAS          1.000
 score FORM_LOW_CONTRAST              1.000
 score FREEM_FRNUM_UNICD_EMPTY        1.000
@@ -334,6 +337,7 @@
 score LUCRATIVE                      1.000
 score MALF_HTML_B64                  1.000
 score MALWARE_PASSWORD               1.000
+score MANY_HDRS_LCASE                0.100
 score MIME_NO_TEXT                   1.000
 score MONERO_DEADLINE                1.000
 score MONERO_EXTORT_01               1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index 4e1e033..da5695c 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,228 +1,235 @@
-# Using score set 0 logs for revision 1891823 from:
-# ham-darxus.r1891823.log ham-ena-week0.r1891823.log ham-ena-week1.r1891823.log ham-ena-week2.r1891823.log ham-ena-week3.r1891823.log ham-ena-week4.r1891823.log ham-giovanni-ham.r1891823.log ham-giovanni-spammy.r1891823.log ham-giovanni-spam.r1891823.log ham-grenier.r1891823.log ham-hege.r1891823.log ham-llanga.r1891823.log ham-mmiroslaw-mails-ham.r1891823.log ham-mmiroslaw-mails-spam.r1891823.log ham-pds.r1891823.log ham-spamsponge.r1891823.log ham-thendrikx.r1891823.log ham-tsz-spam-corpus.r1891823.log spam-darxus.r1891823.log spam-ena-week0.r1891823.log spam-ena-week1.r1891823.log spam-ena-week2.r1891823.log spam-ena-week3.r1891823.log spam-ena-week4.r1891823.log spam-giovanni-ham.r1891823.log spam-giovanni-spammy.r1891823.log spam-giovanni-spam.r1891823.log spam-grenier.r1891823.log spam-hege.r1891823.log spam-llanga.r1891823.log spam-mmiroslaw-mails-ham.r1891823.log spam-mmiroslaw-mails-spam.r1891823.log spam-pds.r1891823.log spam-spamsponge.r1891823.log spam-thendrikx.r1891823.log spam-tsz-spam-corpus.r1891823.log
+# Using score set 0 logs for revision 1891844 from:
+# ham-darxus.r1891844.log ham-ena-week0.r1891844.log ham-ena-week1.r1891844.log ham-ena-week2.r1891844.log ham-ena-week3.r1891844.log ham-ena-week4.r1891844.log ham-giovanni-ham.r1891844.log ham-giovanni-spammy.r1891844.log ham-giovanni-spam.r1891844.log ham-grenier.r1891844.log ham-hege.r1891844.log ham-llanga.r1891844.log ham-mmiroslaw-mails-ham.r1891844.log ham-mmiroslaw-mails-spam.r1891844.log ham-pds.r1891844.log ham-spamsponge.r1891844.log ham-thendrikx.r1891844.log ham-tsz-spam-corpus.r1891844.log spam-darxus.r1891844.log spam-ena-week0.r1891844.log spam-ena-week1.r1891844.log spam-ena-week2.r1891844.log spam-ena-week3.r1891844.log spam-ena-week4.r1891844.log spam-giovanni-ham.r1891844.log spam-giovanni-spammy.r1891844.log spam-giovanni-spam.r1891844.log spam-grenier.r1891844.log spam-hege.r1891844.log spam-llanga.r1891844.log spam-mmiroslaw-mails-ham.r1891844.log spam-mmiroslaw-mails-spam.r1891844.log spam-pds.r1891844.log spam-spamsponge.r1891844.log spam-thendrikx.r1891844.log spam-tsz-spam-corpus.r1891844.log
 
-score ACCT_PHISHING_MANY             2.999
+score ACCT_PHISHING_MANY             2.996
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
-score AC_FROM_MANY_DOTS              2.999
-score AC_HTML_NONSENSE_TAGS          1.899
-score ADMITS_SPAM                    3.599
-score ADVANCE_FEE_2_NEW_FORM         1.569
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.500
-score ADVANCE_FEE_2_NEW_MONEY        1.090
-score ADVANCE_FEE_3_NEW              3.500
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.561
-score ADVANCE_FEE_3_NEW_MONEY        2.533
-score ADVANCE_FEE_4_NEW              2.599
-score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        0.490
-score ADVANCE_FEE_5_NEW              2.699
-score ADVANCE_FEE_5_NEW_FRM_MNY      0.536
-score ADVANCE_FEE_5_NEW_MONEY        0.052
-score AD_PREFS                       0.030
-score ALIBABA_IMG_NOT_RCVD_ALI       2.499
-score AMAZON_IMG_NOT_RCVD_AMZN       2.499
-score APP_DEVELOPMENT_NORDNS         1.586
+score AC_FROM_MANY_DOTS              2.996
+score AC_HTML_NONSENSE_TAGS          1.897
+score ADMITS_SPAM                    3.595
+score ADVANCE_FEE_2_NEW_FORM         0.001
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
+score ADVANCE_FEE_2_NEW_MONEY        1.997
+score ADVANCE_FEE_3_NEW              3.066
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.811
+score ADVANCE_FEE_3_NEW_MONEY        2.083
+score ADVANCE_FEE_4_NEW              2.696
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.464
+score ADVANCE_FEE_4_NEW_MONEY        0.488
+score ADVANCE_FEE_5_NEW              2.796
+score ADVANCE_FEE_5_NEW_FRM_MNY      1.578
+score ADVANCE_FEE_5_NEW_MONEY        0.001
+score AD_PREFS                       0.095
+score ALIBABA_IMG_NOT_RCVD_ALI       2.497
+score AMAZON_IMG_NOT_RCVD_AMZN       1.645
+score APP_DEVELOPMENT_NORDNS         1.997
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.904
-score BIGNUM_EMAILS_FREEM            2.999
-score BIGNUM_EMAILS_MANY             2.772
-score BITCOIN_MALF_HTML              3.499
-score BITCOIN_ONAN                   2.999
-score BITCOIN_SPAM_02                2.253
-score BITCOIN_SPAM_03                2.499
-score BITCOIN_SPAM_07                3.499
-score BITCOIN_XPRIO                  0.001
-score BITCOIN_YOUR_INFO              2.999
-score BOGUS_MIME_VERSION             3.499
-score BOGUS_MSM_HDRS                 1.691
-score BULK_RE_SUSP_NTLD              0.999
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.812
+score BEBEE_IMG_NOT_RCVD_BB          1.656
+score BIGNUM_EMAILS_FREEM            2.996
+score BIGNUM_EMAILS_MANY             2.996
+score BITCOIN_MALF_HTML              3.497
+score BITCOIN_ONAN                   2.996
+score BITCOIN_SPAM_02                1.857
+score BITCOIN_SPAM_03                2.497
+score BITCOIN_SPAM_07                3.497
+score BITCOIN_XPRIO                  0.001 # force non-zero
+score BITCOIN_YOUR_INFO              2.996
+score BOGUS_MIME_VERSION             3.496
+score BOGUS_MSM_HDRS                 1.300
+score BULK_RE_SUSP_NTLD              0.998
 score CK_HELO_GENERIC                0.249
-score CONTENT_AFTER_HTML             2.499
-score CTE_8BIT_MISMATCH              0.999
-score DEAR_BENEFICIARY               1.532
-score DETAILS_OF_PRODUCT             1.249
-score DX_TEXT_03                     0.900
-score EBAY_IMG_NOT_RCVD_EBAY         0.243
-score ENCRYPTED_MESSAGE              -0.906
-score FACEBOOK_IMG_NOT_RCVD_FB       1.999
-score FAKE_REPLY_A1                  4.000
-score FAKE_REPLY_B                   3.900
+score CONTENT_AFTER_HTML             2.497
+score CTE_8BIT_MISMATCH              0.998
+score DEAR_BENEFICIARY               3.096
+score DETAILS_OF_PRODUCT             1.248
+score DX_TEXT_03                     0.899
+score EBAY_IMG_NOT_RCVD_EBAY         0.882
+score ENCRYPTED_MESSAGE              -0.898
+score FACEBOOK_IMG_NOT_RCVD_FB       1.997
+score FAKE_REPLY_A1                  3.995
+score FAKE_REPLY_B                   3.895
 score FILL_THIS_FORM                 1.198
-score FONT_INVIS_DIRECT              2.399
-score FONT_INVIS_DOTGOV              3.499
-score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               2.499
-score FONT_INVIS_NORDNS              2.087
+score FONT_INVIS_DIRECT              2.395
+score FONT_INVIS_DOTGOV              3.497
+score FONT_INVIS_HTML_NOHTML         2.996
+score FONT_INVIS_LONG_LINE           2.996
+score FONT_INVIS_MSGID               2.497
+score FONT_INVIS_NORDNS              2.123
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.250
-score FROMSPACE                      3.200
-score FROM_2_EMAILS_SHORT            2.650
-score FROM_IN_TO_AND_SUBJ            2.499
-score FROM_MISSPACED                 0.001
-score FROM_MISSP_EH_MATCH            0.001 # force non-zero
-score FROM_MISSP_FREEMAIL            2.502
+score FOUND_YOU                      3.246
+score FREEMAIL_FORGED_FROMDOMAIN     0.249
+score FROMSPACE                      3.096
+score FROM_2_EMAILS_SHORT            2.568
+score FROM_IN_TO_AND_SUBJ            2.498
+score FROM_MISSPACED                 1.891
+score FROM_MISSP_DYNIP               0.001
+score FROM_MISSP_EH_MATCH            0.001
+score FROM_MISSP_FREEMAIL            2.500
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.499
+score FROM_MISSP_PHISH               3.496
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              0.354
-score FROM_NAME_EQ_TO_G_DRIVE        0.385
-score FROM_NTLD_REPLY_FREEMAIL       1.999
-score FROM_SUSPICIOUS_NTLD           0.500
-score FROM_SUSPICIOUS_NTLD_FP        1.999
-score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  3.100
+score FROM_MULTI_NORDNS              0.353
+score FROM_NAME_EQ_TO_G_DRIVE        0.402
+score FROM_NTLD_REPLY_FREEMAIL       1.579
+score FROM_SUSPICIOUS_NTLD           0.498
+score FROM_SUSPICIOUS_NTLD_FP        1.998
+score FSL_CTYPE_WIN1251              0.001 # force non-zero
+score FSL_HELO_FAKE                  3.096
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.399
+score FUZZY_AMAZON                   2.497
 score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
-score GOOGLE_DOC_SUSP                2.501
-score GOOG_REDIR_NORDNS              2.600
-score GOOG_STO_EMAIL_PHISH           2.618
-score GOOG_STO_HTML_PHISH            2.543
-score GOOG_STO_HTML_PHISH_MANY       2.386
-score GOOG_STO_IMG_HTML              2.999
-score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       1.999
-score HDRS_LCASE_IMGONLY             0.099
-score HDRS_MISSP                     1.881
-score HDR_ORDER_FTSDMCXX_DIRECT      1.089
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
+score GOOGLE_DOC_SUSP                2.495
+score GOOG_REDIR_NORDNS              3.399
+score GOOG_STO_EMAIL_PHISH           2.293
+score GOOG_STO_HTML_PHISH            2.061
+score GOOG_STO_HTML_PHISH_MANY       3.216
+score GOOG_STO_IMG_HTML              2.996
+score GOOG_STO_NOIMG_HTML            2.996
+score HAS_X_OUTGOING_SPAM_STAT       1.997
+score HDRS_LCASE_IMGONLY             0.098
+score HDRS_MISSP                     1.693
+score HDR_ORDER_FTSDMCXX_DIRECT      1.348
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.250
-score HELO_NO_DOMAIN                 0.001
-score HK_NAME_FM_MR_MRS              1.499
-score HK_NAME_MR_MRS                 1.000
-score HK_RANDOM_ENVFROM              1.000
-score HK_RANDOM_FROM                 1.000
-score HK_RANDOM_REPLYTO              0.999
-score HK_SCAM                        0.543
-score HOSTED_IMG_DIRECT_MX           1.859
-score HOSTED_IMG_FREEM               3.499
-score HOSTED_IMG_MULTI               2.015
-score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_OFF_PAGE                  2.999
-score HTML_TAG_BALANCE_CENTER        1.703
-score HTML_TEXT_INVISIBLE_STYLE      2.481
-score JH_SPAMMY_HEADERS              3.499
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.499
-score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   0.884
-score LONG_INVISIBLE_TEXT            1.768
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
+score HELO_NO_DOMAIN                 0.001 # force non-zero
+score HK_NAME_FM_MR_MRS              1.498
+score HK_NAME_MR_MRS                 0.998
+score HK_RANDOM_ENVFROM              0.998
+score HK_RANDOM_FROM                 0.998
+score HK_RANDOM_REPLYTO              0.998
+score HK_SCAM                        0.483
+score HOSTED_IMG_DIRECT_MX           1.768
+score HOSTED_IMG_FREEM               3.497
+score HOSTED_IMG_MULTI               1.092
+score HOSTED_IMG_MULTI_PUB_01        2.997
+score HTML_ENTITY_ASCII              2.999
+score HTML_OFF_PAGE                  2.996
+score HTML_TAG_BALANCE_CENTER        2.097
+score HTML_TEXT_INVISIBLE_STYLE      2.083
+score IMG_ONLY_FM_DOM_INFO           1.275
+score JH_SPAMMY_HEADERS              3.496
+score LINKEDIN_IMG_NOT_RCVD_LNKN     2.497
+score LONG_HEX_URI                   2.996
+score LONG_IMG_URI                   0.890
+score LONG_INVISIBLE_TEXT            1.735
 score LOTS_OF_MONEY                  0.010
-score MALWARE_NORDNS                 2.102
-score MANY_SPAN_IN_TEXT              2.399
-score MILLION_HUNDRED                3.199
-score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           1.013
-score MIXED_AREA_CASE                1.377
-score MIXED_CENTER_CASE              2.499
-score MIXED_ES                       3.000
-score MIXED_FONT_CASE                1.093
-score MIXED_HREF_CASE                1.374
-score MIXED_IMG_CASE                 0.300
-score MONEY_ATM_CARD                 2.899
-score MONEY_FORM                     0.074
-score MONEY_FORM_SHORT               1.250
+score LOTTO_AGENT                    0.986
+score LOTTO_DEPT                     1.997
+score MALWARE_NORDNS                 2.103
+score MANY_SPAN_IN_TEXT              2.397
+score MILLION_HUNDRED                3.196
+score MILLION_USD                    0.216
+score MIMEOLE_DIRECT_TO_MX           0.553
+score MIXED_AREA_CASE                1.547
+score MIXED_CENTER_CASE              1.630
+score MIXED_ES                       2.997
+score MIXED_FONT_CASE                1.342
+score MIXED_HREF_CASE                1.896
+score MIXED_IMG_CASE                 2.570
+score MONEY_ATM_CARD                 1.911
+score MONEY_FORM                     0.001
+score MONEY_FORM_SHORT               1.239
 score MONEY_FRAUD_3                  0.001
-score MONEY_FRAUD_5                  0.655
-score MONEY_FRAUD_8                  0.406
-score MONEY_FREEMAIL_REPTO           2.999
-score MONEY_FROM_41                  1.999
+score MONEY_FRAUD_5                  0.657
+score MONEY_FRAUD_8                  0.785
+score MONEY_FREEMAIL_REPTO           2.996
+score MONEY_FROM_41                  1.997
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.554
-score MSGID_WSP_TRAIL                0.927
-score MSMAIL_PRI_ABNORMAL            0.001
-score NAME_EMAIL_DIFF                1.850
-score NA_DOLLARS                     1.434
-score NEW_PRODUCTS                   1.249
-score NICE_REPLY_A                   -1.718
-score NOT_SPAM                       3.299
-score NO_FM_NAME_IP_HOSTN            0.198
+score MONEY_NOHTML                   1.671
+score MSGID_WSP_TRAIL                1.062
+score MSMAIL_PRI_ABNORMAL            0.314
+score NAME_EMAIL_DIFF                1.917
+score NA_DOLLARS                     0.829
+score NEW_PRODUCTS                   1.248
+score NICE_REPLY_A                   -0.246
+score NOT_SPAM                       3.296
+score NO_FM_NAME_IP_HOSTN            0.288
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.343
+score NUMBEREND_LINKBAIT             0.999
 score OBFU_TEXT_ATTACH               0.001
-score ODD_FREEM_REPTO                2.999
-score OFFER_ONLY_AMERICA             0.828
-score ONLINE_MKTG_CNSLT              2.600
-score ORDER_TODAY                    1.035
-score PDS_BTC_ID                     0.499
+score ODD_FREEM_REPTO                2.996
+score OFFER_ONLY_AMERICA             1.650
+score ONLINE_MKTG_CNSLT              2.596
+score ORDER_TODAY                    1.569
+score PDS_BTC_ID                     0.498
 score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   1.999
-score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_FRNOM_TODOM_DBL_URL        1.490
-score PDS_FRNOM_TODOM_NAKED_TO       1.499
-score PDS_FROM_2_EMAILS_SHRTNER      1.499
-score PDS_FROM_NAME_TO_DOMAIN        1.999
-score PDS_HP_HELO_NORDNS             0.999
-score PDS_OTHER_BAD_TLD              1.999
-score PDS_PHP_EVAL                   1.499
+score PDS_BTC_NTLD                   1.923
+score PDS_DBL_URL_TNB_RUNON          1.997
+score PDS_FRNOM_TODOM_DBL_URL        1.499
+score PDS_FRNOM_TODOM_NAKED_TO       1.498
+score PDS_FROM_2_EMAILS_SHRTNER      1.013
+score PDS_FROM_NAME_TO_DOMAIN        1.997
+score PDS_HP_HELO_NORDNS             0.998
+score PDS_OTHER_BAD_TLD              1.997
+score PDS_PHP_EVAL                   1.498
 score PDS_RDNS_DYNAMIC_FP            0.001 # force non-zero
-score PDS_SHORTFWD_URISHRT_FP        1.499
+score PDS_SHORTFWD_URISHRT_FP        1.498
 score PDS_TINYSUBJ_URISHRT           1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_TO_EQ_FROM_NAME            3.099
-score PHP_ORIG_SCRIPT                2.407
-score PHP_ORIG_SCRIPT_EVAL           3.000
-score PHP_SCRIPT                     2.499
-score PP_MIME_FAKE_ASCII_TEXT        0.999
-score RAND_HEADER_LIST_SPOOF         2.999
-score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                2.760
-score RDNS_NUM_TLD_XM                2.012
-score READY_TO_SHIP                  1.249
-score REPLYTO_EMPTY                  2.400
-score REPTO_419_FRAUD                1.921
-score REPTO_419_FRAUD_GM             2.999
-score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      3.099
-score SCC_NEWBIE_HASBEENS            1.728
-score SENDGRID_REDIR                 1.499
-score SERGIO_SUBJECT_VIAGRA01        2.894
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.500
-score SHORTENER_SHORT_IMG            2.330
-score SHORT_SHORTNER                 1.999
-score STATIC_XPRIO_OLE               1.191
-score TAGSTAT_IMG_NOT_RCVD_TGST      1.999
-score THIS_AD                        1.299
-score THIS_IS_ADV_SUSP_NTLD          0.602
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
+score PDS_TO_EQ_FROM_NAME            3.196
+score PHP_ORIG_SCRIPT                2.249
+score PHP_ORIG_SCRIPT_EVAL           2.996
+score PHP_SCRIPT                     2.497
+score PP_MIME_FAKE_ASCII_TEXT        0.998
+score RAND_HEADER_LIST_SPOOF         2.996
+score RAND_MKTG_HEADER               1.997
+score RATWARE_NO_RDNS                1.892
+score RDNS_NUM_TLD_XM                1.628
+score READY_TO_SHIP                  1.248
+score REPLYTO_EMPTY                  2.397
+score REPTO_419_FRAUD                2.938
+score REPTO_419_FRAUD_GM             2.996
+score REPTO_419_FRAUD_GM_LOOSE       0.998
+score RISK_FREE                      3.096
+score SCC_NEWBIE_HASBEENS            1.717
+score SENDGRID_REDIR                 1.498
+score SERGIO_SUBJECT_VIAGRA01        3.095
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
+score SHORTENER_SHORT_IMG            0.973
+score SHORT_SHORTNER                 1.997
+score STATIC_XPRIO_OLE               1.552
+score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
+score TARINGANET_IMG_NOT_RCVD_TN     1.999
+score THIS_AD                        1.298
+score THIS_IS_ADV_SUSP_NTLD          1.477
 score TO_EQ_FM_DIRECT_MX             0.001 # force non-zero
-score TO_IN_SUBJ                     0.099
-score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.999
-score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_NORDNS_HTML        2.000
-score TO_NO_BRKTS_PCNT               2.499
-score TRANSFORM_LIFE                 2.499
-score TVD_PH_BODY_META               3.100
-score TVD_RCVD_SPACE_BRACKET         2.799
-score UNDISC_FREEM                   2.999
-score UNDISC_MONEY                   3.399
-score URI_DEOBFU_INSTR               4.399
-score URI_DOTEDU                     1.999
-score URI_DQ_UNSUB                   2.499
-score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               3.099
-score URI_GOOG_STO_SPAMMY            2.999
-score URI_LONG_REPEAT                2.499
-score URI_PHISH                      4.000
-score URI_PHP_REDIR                  3.499
-score URI_TRY_3LD                    1.999
-score URI_WPADMIN                    2.699
-score URI_WP_HACKED_2                2.499
-score VFY_ACCT_NORDNS                0.400
-score WALMART_IMG_NOT_RCVD_WAL       1.887
-score WANT_TO_ORDER                  2.750
-score WORD_INVIS_MANY                2.400
-score XFER_LOTSA_MONEY               0.999
-score XM_DIGITS_ONLY                 0.368
-score XM_RANDOM                      2.500
-score XM_RECPTID                     2.999
-score XPRIO_URL_SHORTNER             0.999
-score YOUR_DELIVERY_ADDRESS          0.037
-score YOU_INHERIT                    2.699
+score TO_IN_SUBJ                     0.098
+score TO_NO_BRKTS_FROM_MSSP          2.497
+score TO_NO_BRKTS_HTML_IMG           1.997
+score TO_NO_BRKTS_HTML_ONLY          1.997
+score TO_NO_BRKTS_NORDNS_HTML        1.997
+score TO_NO_BRKTS_PCNT               2.498
+score TRANSFORM_LIFE                 2.497
+score TVD_PH_BODY_META               3.096
+score TVD_RCVD_SPACE_BRACKET         2.797
+score UNDISC_FREEM                   3.096
+score UNDISC_MONEY                   3.396
+score URI_DEOBFU_INSTR               4.395
+score URI_DOTEDU                     1.997
+score URI_DQ_UNSUB                   2.497
+score URI_FIREBASEAPP                2.996
+score URI_GOOGLE_PROXY               3.096
+score URI_GOOG_STO_SPAMMY            2.996
+score URI_LONG_REPEAT                2.497
+score URI_PHISH                      3.995
+score URI_PHP_REDIR                  3.496
+score URI_TRY_3LD                    1.937
+score URI_WPADMIN                    2.596
+score URI_WP_HACKED_2                2.497
+score VFY_ACCT_NORDNS                2.516
+score WALMART_IMG_NOT_RCVD_WAL       1.681
+score WANT_TO_ORDER                  2.746
+score WORD_INVIS_MANY                2.399
+score XFER_LOTSA_MONEY               0.741
+score XM_DIGITS_ONLY                 0.551
+score XM_RANDOM                      2.497
+score XM_RECPTID                     2.996
+score XPRIO_URL_SHORTNER             0.998
+score YOUR_DELIVERY_ADDRESS          0.034
+score YOU_INHERIT                    2.514
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -235,7 +242,6 @@
 score AC_SPAMMY_URI_PATTERNS9        1.000
 score ADULT_DATING_COMPANY           10.001 # force non-zero
 score APP_DEVELOPMENT_FREEM          1.000
-score BEBEE_IMG_NOT_RCVD_BB          1.000
 score BITCOIN_BOMB                   1.000
 score BITCOIN_DEADLINE               1.000
 score BITCOIN_EXTORT_01              1.000
@@ -272,6 +278,7 @@
 score FREEM_FRNUM_UNICD_EMPTY        1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB     1.000
 score FROM_ADDR_WS                   1.000
+score FROM_MISSP_REPLYTO             1.000
 score FROM_NTLD_LINKBAIT             1.000
 score FROM_NUMERIC_TLD               1.000
 score GAPPY_SALES_LEADS_FREEM        1.000
@@ -290,21 +297,19 @@
 score HK_RCVD_IP_MULTICAST           1.000
 score HK_WIN                         1.000
 score HOSTED_IMG_DQ_UNSUB            1.000
-score HTML_ENTITY_ASCII              1.000
 score HTML_ENTITY_ASCII_TINY         1.000
 score HTML_SHRT_CMNT_OBFU_MANY       1.000
 score HTML_SINGLET_MANY              1.000
 score HTML_TEXT_INVISIBLE_FONT       1.000
-score IMG_ONLY_FM_DOM_INFO           1.000
 score JH_SPAMMY_PATTERN01            1.000
 score JH_SPAMMY_PATTERN02            1.000
 score KHOP_HELO_FCRDNS               0.400
 score LIST_PRTL_PUMPDUMP             1.000
 score LIST_PRTL_SAME_USER            1.000
-score LOTTO_AGENT                    1.000
 score LUCRATIVE                      1.000
 score MALF_HTML_B64                  1.000
 score MALWARE_PASSWORD               1.000
+score MANY_HDRS_LCASE                0.100
 score MIME_NO_TEXT                   1.000
 score MONERO_DEADLINE                1.000
 score MONERO_EXTORT_01               1.000
@@ -315,7 +320,6 @@
 score MSM_PRIO_REPTO                 1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
-score PDS_FROM_2_EMAILS              1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHISH_FBASEAPP                 1.000
 score PHOTO_EDITING_DIRECT           1.000
@@ -350,10 +354,11 @@
 score STOCK_TIP                      1.000
 score SUBJ_BRKN_WORDNUMS             1.000
 score SYSADMIN                       1.000
-score TARINGANET_IMG_NOT_RCVD_TN     1.000
 score TONLINE_FAKE_DKIM              1.000
 score TO_NAME_SUBJ_NO_RDNS           1.000
+score TO_NO_BRKTS_MSFT               1.000
 score TVD_SPACE_ENCODED              1.000
+score TVD_SPACE_RATIO_MINFP          1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ASC               1.000
@@ -415,3 +420,4 @@
 score SURBL_BLOCKED                  0.001 # force non-zero
 score TO_EQ_FM_DOM_SPF_FAIL          0.001 # force non-zero
 score TO_EQ_FM_SPF_FAIL              0.001 # force non-zero
+score USER_IN_DKIM_WELCOMELIST       0.001 # force non-zero
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index 84f495c..87dda29 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -7,168 +7,168 @@
 score AC_FROM_MANY_DOTS              2.996
 score AC_HTML_NONSENSE_TAGS          1.997
 score ADMITS_SPAM                    3.396
-score ADVANCE_FEE_2_NEW_FORM         1.361
+score ADVANCE_FEE_2_NEW_FORM         0.471
 score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
 score ADVANCE_FEE_2_NEW_MONEY        0.001
-score ADVANCE_FEE_3_NEW              3.408
+score ADVANCE_FEE_3_NEW              3.407
 score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_3_NEW_MONEY        0.981
+score ADVANCE_FEE_3_NEW_MONEY        0.982
 score ADVANCE_FEE_4_NEW              2.397
-score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW              2.497
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_5_NEW_MONEY        0.001
 score AD_PREFS                       0.498
-score ALIBABA_IMG_NOT_RCVD_ALI       1.351
+score ALIBABA_IMG_NOT_RCVD_ALI       0.163
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         0.442
+score APP_DEVELOPMENT_NORDNS         0.205
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.722
-score BIGNUM_EMAILS_FREEM            2.144
+score BIGNUM_EMAILS_FREEM            2.033
 score BITCOIN_MALF_HTML              3.496
 score BITCOIN_MALWARE                0.001
-score BITCOIN_ONAN                   2.997
-score BITCOIN_SPAM_02                1.248
-score BITCOIN_SPAM_03                2.153
+score BITCOIN_ONAN                   2.996
+score BITCOIN_SPAM_02                1.326
+score BITCOIN_SPAM_03                1.532
 score BITCOIN_SPAM_05                2.497
-score BITCOIN_SPAM_07                3.092
-score BITCOIN_XPRIO                  0.223
-score BITCOIN_YOUR_INFO              2.305
+score BITCOIN_SPAM_07                3.089
+score BITCOIN_XPRIO                  0.149
+score BITCOIN_YOUR_INFO              2.308
 score BODY_URI_ONLY                  0.001
-score BOGUS_MIME_VERSION             3.183
+score BOGUS_MIME_VERSION             3.278
 score CK_HELO_GENERIC                0.008
-score CONTENT_AFTER_HTML             2.417
+score CONTENT_AFTER_HTML             2.418
 score CTE_8BIT_MISMATCH              0.001
 score DEAR_BENEFICIARY               2.896
 score DETAILS_OF_PRODUCT             1.248
-score DKIMWL_BL                      2.313
-score DKIMWL_WL_HIGH                 -0.719
+score DKIMWL_BL                      2.334
+score DKIMWL_WL_HIGH                 -0.717
 score DKIMWL_WL_MED                  -0.001
-score DKIMWL_WL_MEDHI                -0.672
+score DKIMWL_WL_MEDHI                -0.275
 score DX_TEXT_03                     0.698
-score DYNAMIC_IMGUR                  3.815
-score EBAY_IMG_NOT_RCVD_EBAY         1.130
+score DYNAMIC_IMGUR                  2.851
+score EBAY_IMG_NOT_RCVD_EBAY         1.666
 score ENCRYPTED_MESSAGE              -0.998
 score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  3.611
+score FAKE_REPLY_A1                  2.642
 score FAKE_REPLY_B                   3.695
-score FILL_THIS_FORM                 0.001
+score FILL_THIS_FORM                 0.001 # force non-zero
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_DOTGOV              3.496
 score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_LONG_LINE           2.996
-score FONT_INVIS_MSGID               1.843
-score FONT_INVIS_NORDNS              2.300
+score FONT_INVIS_MSGID               1.842
+score FONT_INVIS_NORDNS              1.749
 score FORGED_SPF_HELO                1.597
-score FORM_FRAUD                     0.001 # force non-zero
+score FORM_FRAUD                     0.001
 score FORM_FRAUD_3                   2.596
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      0.302
-score FREEMAIL_FORGED_FROMDOMAIN     0.248
-score FROMSPACE                      2.534
+score FOUND_YOU                      1.913
+score FREEMAIL_FORGED_FROMDOMAIN     0.249
+score FROMSPACE                      2.595
 score FROM_2_EMAILS_SHORT            2.996
 score FROM_BANK_NOAUTH               0.998
 score FROM_FMBLA_NEWDOM              1.498
 score FROM_FMBLA_NEWDOM14            0.998
-score FROM_FMBLA_NEWDOM28            0.799
-score FROM_GOV_DKIM_AU               -0.736
+score FROM_FMBLA_NEWDOM28            0.798
+score FROM_GOV_DKIM_AU               -0.752
 score FROM_GOV_SPOOF                 0.001
 score FROM_MISSPACED                 0.001
+score FROM_MISSP_DYNIP               2.197
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            0.001 # force non-zero
+score FROM_MISSP_FREEMAIL            0.001
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_PHISH               3.496
+score FROM_MISSP_REPLYTO             0.001
 score FROM_MISSP_SPF_FAIL            0.001
-score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              2.093
-score FROM_NAME_EQ_TO_G_DRIVE        0.465
-score FROM_NTLD_REPLY_FREEMAIL       0.594
-score FROM_PAYPAL_SPOOF              0.001 # force non-zero
-score FROM_SUSPICIOUS_NTLD           0.498
-score FROM_SUSPICIOUS_NTLD_FP        1.025
-score FSL_BULK_SIG                   2.620
+score FROM_MISSP_USER                0.001 # force non-zero
+score FROM_MULTI_NORDNS              2.346
+score FROM_NAME_EQ_TO_G_DRIVE        0.001
+score FROM_NTLD_REPLY_FREEMAIL       1.121
+score FROM_PAYPAL_SPOOF              0.001
+score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_SUSPICIOUS_NTLD_FP        1.099
+score FSL_BULK_SIG                   2.617
 score FSL_CTYPE_WIN1251              0.001
 score FSL_HELO_FAKE                  2.896
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.198
+score FUZZY_AMAZON                   2.197
 score GB_FAKE_RF_SHORT               1.997
-score GB_FREEMAIL_DISPTO             0.499
+score GB_FREEMAIL_DISPTO             0.498
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
 score GOOGLE_DOC_SUSP                2.996
 score GOOG_REDIR_NORDNS              2.996
-score GOOG_STO_EMAIL_PHISH           2.727
-score GOOG_STO_HTML_PHISH            1.177
-score GOOG_STO_HTML_PHISH_MANY       3.326
-score GOOG_STO_IMG_HTML              2.997
+score GOOG_STO_EMAIL_PHISH           2.563
+score GOOG_STO_HTML_PHISH            2.424
+score GOOG_STO_HTML_PHISH_MANY       1.648
+score GOOG_STO_IMG_HTML              2.996
 score GOOG_STO_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       0.793
-score HDRS_LCASE                     0.099
-score HDRS_LCASE_IMGONLY             0.093
+score HAS_X_OUTGOING_SPAM_STAT       1.025
+score HDRS_LCASE                     0.098
+score HDRS_LCASE_IMGONLY             0.001 # force non-zero
 score HDRS_MISSP                     0.001
-score HDR_ORDER_FTSDMCXX_DIRECT      0.001 # force non-zero
-score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
+score HDR_ORDER_FTSDMCXX_DIRECT      0.001
+score HDR_ORDER_FTSDMCXX_NORDNS      0.001 # force non-zero
+score HEADER_FROM_DIFFERENT_DOMAINS  0.248
 score HELO_NO_DOMAIN                 0.001
-score HK_NAME_FM_MR_MRS              0.542
-score HK_NAME_MR_MRS                 0.086
+score HK_NAME_FM_MR_MRS              0.749
+score HK_NAME_MR_MRS                 0.218
 score HK_RANDOM_ENVFROM              0.998
-score HK_RANDOM_FROM                 0.999
-score HK_RANDOM_REPLYTO              0.586
+score HK_RANDOM_FROM                 0.998
+score HK_RANDOM_REPLYTO              0.395
 score HK_SCAM                        0.001
-score HOSTED_IMG_DIRECT_MX           2.505
+score HOSTED_IMG_DIRECT_MX           1.988
 score HOSTED_IMG_FREEM               3.496
 score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_OFF_PAGE                  1.813
-score HTML_SINGLET_MANY              0.903
-score HTML_TEXT_INVISIBLE_FONT       0.028
-score HTML_TEXT_INVISIBLE_STYLE      2.020
+score HTML_OFF_PAGE                  2.663
+score HTML_SINGLET_MANY              0.998
+score HTML_TEXT_INVISIBLE_FONT       0.146
+score HTML_TEXT_INVISIBLE_STYLE      2.084
 score JH_SPAMMY_HEADERS              3.496
+score KHOP_FAKE_EBAY                 1.099
 score KHOP_HELO_FCRDNS               0.398
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.079
-score LONG_HEX_URI                   0.942
-score LONG_IMG_URI                   0.933
-score LONG_INVISIBLE_TEXT            0.156
+score LINKEDIN_IMG_NOT_RCVD_LNKN     2.499
+score LONG_HEX_URI                   0.948
+score LONG_IMG_URI                   0.943
+score LONG_INVISIBLE_TEXT            0.171
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    1.498
-score MALWARE_NORDNS                 0.443
+score MALWARE_NORDNS                 0.352
 score MANY_SPAN_IN_TEXT              2.297
 score MILLION_HUNDRED                2.896
 score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           0.231
-score MIXED_AREA_CASE                2.442
-score MIXED_CENTER_CASE              1.034
-score MIXED_ES                       2.597
-score MIXED_FONT_CASE                1.309
-score MIXED_HREF_CASE                0.801
-score MIXED_IMG_CASE                 0.756
+score MIMEOLE_DIRECT_TO_MX           0.320
+score MIXED_AREA_CASE                0.641
+score MIXED_CENTER_CASE              2.164
+score MIXED_ES                       2.598
+score MIXED_FONT_CASE                1.594
+score MIXED_HREF_CASE                0.606
+score MIXED_IMG_CASE                 1.623
 score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
+score MONEY_FORM                     0.001
 score MONEY_FORM_SHORT               0.001
 score MONEY_FRAUD_3                  0.001
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.216
+score MONEY_FREEMAIL_REPTO           1.329
 score MONEY_FROM_41                  1.997
-score MONEY_FROM_MISSP               0.001 # force non-zero
-score MONEY_NOHTML                   1.117
-score MSGID_WSP_TRAIL                1.271
-score MSMAIL_PRI_ABNORMAL            0.001
-score NAME_EMAIL_DIFF                2.443
-score NA_DOLLARS                     0.451
+score MONEY_FROM_MISSP               0.001
+score MONEY_NOHTML                   0.948
+score MSGID_WSP_TRAIL                0.675
+score MSMAIL_PRI_ABNORMAL            1.179
+score NAME_EMAIL_DIFF                2.441
+score NA_DOLLARS                     0.538
 score NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.277
-score NOT_SPAM                       2.996
-score NO_FM_NAME_IP_HOSTN            0.486
-score NSL_RCVD_FROM_USER             0.001
+score NICE_REPLY_A                   -0.125
+score NOT_SPAM                       3.096
+score NO_FM_NAME_IP_HOSTN            0.491
+score NSL_RCVD_FROM_USER             0.001 # force non-zero
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.346
-score ODD_FREEM_REPTO                2.722
-score ONLINE_MKTG_CNSLT              2.297
-score ORDER_TODAY                    0.405
+score NUMBEREND_LINKBAIT             0.575
+score ODD_FREEM_REPTO                2.448
+score ONLINE_MKTG_CNSLT              2.397
+score ORDER_TODAY                    1.240
 score PDS_BTC_ID                     0.498
 score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   0.224
+score PDS_BTC_NTLD                   1.220
 score PDS_FRNOM_TODOM_DBL_URL        1.498
 score PDS_FRNOM_TODOM_NAKED_TO       1.498
 score PDS_FROM_2_EMAILS_SHRTNER      1.498
@@ -177,82 +177,84 @@
 score PDS_OTHER_BAD_TLD              1.997
 score PDS_PHP_EVAL                   1.498
 score PDS_RDNS_DYNAMIC_FP            0.001 # force non-zero
-score PDS_SHORTFWD_URISHRT_FP        1.476
-score PDS_TINYSUBJ_URISHRT           1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.593
-score PDS_TO_EQ_FROM_NAME            2.975
-score PHP_ORIG_SCRIPT                0.587
+score PDS_SHORTFWD_URISHRT_FP        1.216
+score PDS_TINYSUBJ_URISHRT           1.498
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.594
+score PDS_TO_EQ_FROM_NAME            2.590
+score PHP_ORIG_SCRIPT                0.585
 score PHP_ORIG_SCRIPT_EVAL           2.996
-score PHP_SCRIPT                     2.497
+score PHP_SCRIPT                     2.265
 score PP_MIME_FAKE_ASCII_TEXT        0.998
 score RAND_HEADER_LIST_SPOOF         2.996
 score RAND_MKTG_HEADER               1.997
-score RATWARE_NO_RDNS                2.354
-score RCVD_IN_MSPIKE_H2              -0.001 # force non-zero
-score RDNS_NUM_TLD_XM                1.994
+score RATWARE_NO_RDNS                1.647
+score RCVD_IN_MSPIKE_H2              -0.001
+score RDNS_NUM_TLD_XM                1.887
 score READY_TO_SHIP                  1.248
 score REPTO_419_FRAUD                2.999
-score REPTO_419_FRAUD_GM             2.851
+score REPTO_419_FRAUD_GM             2.715
 score REPTO_419_FRAUD_GM_LOOSE       0.998
 score RISK_FREE                      2.896
-score SCC_NEWBIE_HASBEENS            1.699
-score SENDGRID_REDIR                 1.240
-score SERGIO_SUBJECT_VIAGRA01        4.096
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.498
-score SHORTENER_SHORT_IMG            2.136
-score SHORT_SHORTNER                 0.715
-score SINGLETS_LOW_CONTRAST          2.917
-score SPOOFED_FREEMAIL               1.221
+score SCC_NEWBIE_HASBEENS            1.044
+score SENDGRID_REDIR                 1.098
+score SERGIO_SUBJECT_VIAGRA01        4.095
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
+score SHORTENER_SHORT_IMG            1.221
+score SHORT_SHORTNER                 0.676
+score SINGLETS_LOW_CONTRAST          2.718
+score SPOOFED_FREEMAIL               1.224
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            0.001
-score SPOOFED_FREEM_REPTO_CHN        3.379
+score SPOOFED_FREEM_REPTO_CHN        0.646
 score SPOOF_GMAIL_MID                1.498
 score STATIC_XPRIO_OLE               1.997
 score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
-score THIS_AD                        0.998
+score THIS_AD                        0.999
 score TO_EQ_FM_DIRECT_MX             2.497
+score TO_EQ_FM_DOM_HTML_ONLY         2.696
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
-score TO_EQ_FM_HTML_ONLY             2.297
+score TO_EQ_FM_HTML_ONLY             1.514
 score TO_EQ_FM_SPF_FAIL              0.001
 score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.637
+score TO_NAME_SUBJ_NO_RDNS           2.128
 score TO_NO_BRKTS_FROM_MSSP          0.001
-score TO_NO_BRKTS_HTML_IMG           0.071
+score TO_NO_BRKTS_HTML_IMG           0.078
 score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_NORDNS_HTML        1.204
+score TO_NO_BRKTS_MSFT               0.001
+score TO_NO_BRKTS_NORDNS_HTML        1.205
 score TO_NO_BRKTS_PCNT               2.497
 score TRANSFORM_LIFE                 2.497
 score TVD_PH_BODY_META               2.796
-score TVD_RCVD_SPACE_BRACKET         1.767
+score TVD_RCVD_SPACE_BRACKET         1.087
 score TVD_SPACE_ENCODED              0.001
+score TVD_SPACE_RATIO_MINFP          0.001
 score UNDISC_FREEM                   2.696
 score UNDISC_MONEY                   3.096
-score UPGRADE_MAILBOX                0.701
 score URI_DEOBFU_INSTR               4.195
-score URI_DOTEDU                     1.837
-score URI_DQ_UNSUB                   1.821
+score URI_DOTEDU                     1.773
+score URI_DQ_UNSUB                   1.896
 score URI_FIREBASEAPP                2.996
 score URI_GOOGLE_PROXY               2.596
 score URI_GOOG_STO_SPAMMY            2.996
-score URI_LONG_REPEAT                2.422
+score URI_LONG_REPEAT                2.351
 score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      3.310
+score URI_PHISH                      3.334
 score URI_PHP_REDIR                  3.496
 score URI_TRY_3LD                    1.997
 score URI_WPADMIN                    2.397
-score URI_WP_HACKED                  0.001
+score URI_WP_HACKED                  0.040
 score URI_WP_HACKED_2                2.497
 score VFY_ACCT_NORDNS                2.061
-score WALMART_IMG_NOT_RCVD_WAL       1.682
-score WANT_TO_ORDER                  2.426
+score WALMART_IMG_NOT_RCVD_WAL       2.464
+score WANT_TO_ORDER                  2.225
 score WORD_INVIS_MANY                2.996
 score XFER_LOTSA_MONEY               0.998
 score XM_DIGITS_ONLY                 0.001
-score XM_RANDOM                      0.936
+score XM_RANDOM                      0.947
 score XM_RECPTID                     2.996
 score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          0.308
-score YOU_INHERIT                    2.127
+score YOUR_DELIVERY_ADDRESS          0.290
+score YOU_INHERIT                    1.060
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -297,6 +299,7 @@
 score ENVFROM_GOOG_TRIX              1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000
+score FONT_INVIS_LONG_LINE           1.000
 score FONT_INVIS_POSTEXTRAS          1.000
 score FORM_LOW_CONTRAST              1.000
 score FREEM_FRNUM_UNICD_EMPTY        1.000
@@ -334,6 +337,7 @@
 score LUCRATIVE                      1.000
 score MALF_HTML_B64                  1.000
 score MALWARE_PASSWORD               1.000
+score MANY_HDRS_LCASE                0.100
 score MIME_NO_TEXT                   1.000
 score MONERO_DEADLINE                1.000
 score MONERO_EXTORT_01               1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index d8987ee..8664635 100644
--- a/rulesrc/scores/stats-set0
+++ b/rulesrc/scores/stats-set0
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 226034  36.138%  (99.691% of non-spam corpus)
-# Correctly spam:     306263  48.965%  (76.808% of spam corpus)
-# False positives:       701  0.112%  (0.309% of nonspam,  39166 weighted)
-# False negatives:     92473  14.785%  (23.192% of spam, 147910 weighted)
+# Correctly non-spam: 225684  36.744%  (99.726% of non-spam corpus)
+# Correctly spam:     294299  47.915%  (75.868% of spam corpus)
+# False positives:       620  0.101%  (0.274% of nonspam,  34657 weighted)
+# False negatives:     93609  15.241%  (24.132% of spam, 151510 weighted)
 # Average score for spam:  11.2    nonspam: 0.6
-# Average for false-pos:   6.4  false-neg: 1.6
-# TOTAL:              625471  100.00%
+# Average for false-pos:   6.5  false-neg: 1.6
+# TOTAL:              614212  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  28288  99.64%
-# Correctly spam:      38551  77.52%
-# False positives:       101  0.36%
-# False negatives:     11178  22.48%
-# TCR(l=50): 3.064395  SpamRecall: 77.522%  SpamPrec: 99.739%
+# Correctly non-spam:  28263  99.75%
+# Correctly spam:      36825  76.18%
+# False positives:        72  0.25%
+# False negatives:     11515  23.82%
+# TCR(l=50): 3.198148  SpamRecall: 76.179%  SpamPrec: 99.805%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 216911  95.67%
-# Correctly spam:     220597  55.32%
-# False positives:      9824  4.33%
-# False negatives:    178139  44.68%
-# TCR(l=50): 0.595716  SpamRecall: 55.324%  SpamPrec: 95.736%
+# Correctly non-spam: 216442  95.64%
+# Correctly spam:     213331  55.00%
+# False positives:      9862  4.36%
+# False negatives:    174577  45.00%
+# TCR(l=50): 0.580982  SpamRecall: 54.995%  SpamPrec: 95.581%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  27120  95.53%
-# Correctly spam:      27617  55.53%
-# False positives:      1269  4.47%
-# False negatives:     22112  44.47%
-# TCR(l=50): 0.581204  SpamRecall: 55.535%  SpamPrec: 95.607%
+# Correctly non-spam:  27107  95.67%
+# Correctly spam:      26632  55.09%
+# False positives:      1228  4.33%
+# False negatives:     21708  44.91%
+# TCR(l=50): 0.581653  SpamRecall: 55.093%  SpamPrec: 95.592%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 8309547..b609adf 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,23 +1,23 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 236666  37.406%  (99.595% of non-spam corpus)
-# Correctly spam:     353243  55.832%  (89.415% of spam corpus)
-# False positives:       963  0.152%  (0.405% of nonspam, 114817 weighted)
-# False negatives:     41816  6.609%  (10.585% of spam,  79431 weighted)
-# Average score for spam:  17.0    nonspam: -0.7
+# Correctly non-spam: 236661  37.406%  (99.593% of non-spam corpus)
+# Correctly spam:     353522  55.876%  (89.486% of spam corpus)
+# False positives:       968  0.153%  (0.407% of nonspam, 115166 weighted)
+# False negatives:     41536  6.565%  (10.514% of spam,  77806 weighted)
+# Average score for spam:  17.2    nonspam: -0.7
 # Average for false-pos:   7.2  false-neg: 1.9
-# TOTAL:              632688  100.00%
+# TOTAL:              632687  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  29599  99.59%
-# Correctly spam:      44095  89.46%
-# False positives:       121  0.41%
-# False negatives:      5193  10.54%
-# TCR(l=50): 4.383883  SpamRecall: 89.464%  SpamPrec: 99.726%
+# Correctly non-spam:  29603  99.61%
+# Correctly spam:      44179  89.63%
+# False positives:       117  0.39%
+# False negatives:      5109  10.37%
+# TCR(l=50): 4.497491  SpamRecall: 89.634%  SpamPrec: 99.736%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam: 236875  99.68%
-# Correctly spam:     274453  69.47%
+# Correctly spam:     274419  69.46%
 # False positives:       754  0.32%
-# False negatives:    120606  30.53%
-# TCR(l=50): 2.495540  SpamRecall: 69.471%  SpamPrec: 99.726%
+# False negatives:    120639  30.54%
+# TCR(l=50): 2.495014  SpamRecall: 69.463%  SpamPrec: 99.726%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam:  29627  99.69%
-# Correctly spam:      34121  69.23%
+# Correctly spam:      34212  69.41%
 # False positives:        93  0.31%
-# False negatives:     15167  30.77%
-# TCR(l=50): 2.487157  SpamRecall: 69.228%  SpamPrec: 99.728%
+# False negatives:     15076  30.59%
+# TCR(l=50): 2.498631  SpamRecall: 69.412%  SpamPrec: 99.729%