updated scores for revision 1891823 active rules added since last mass-check

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1891837 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index a4fd434..07e44b8 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,8 +1,8 @@
-score ACCT_PHISHING_MANY                    2.996 2.996 2.996 2.996
+score ACCT_PHISHING_MANY                    2.999 2.996 2.999 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.996 2.996 2.996 2.996
-score AC_HTML_NONSENSE_TAGS                 1.997 1.997 1.997 1.997
+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_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,281 +13,286 @@
 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.595 3.396 3.595 3.396
+score ADMITS_SPAM                           3.599 3.396 3.599 3.396
 score ADULT_DATING_COMPANY                  10.001 10.001 10.001 10.001
-score ADVANCE_FEE_2_NEW_FORM                0.372 0.098 0.372 0.098
-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.239 3.400 3.239 3.400
-score ADVANCE_FEE_3_NEW_FRM_MNY             0.001 0.001 0.001 0.001
-score ADVANCE_FEE_3_NEW_MONEY               2.042 0.986 2.042 0.986
-score ADVANCE_FEE_4_NEW                     2.596 2.397 2.596 2.397
-score ADVANCE_FEE_4_NEW_MONEY               1.632 0.001 1.632 0.001
-score ADVANCE_FEE_5_NEW                     2.696 2.497 2.696 2.497
-score ADVANCE_FEE_5_NEW_FRM_MNY             1.500 0.001 1.500 0.001
-score ADVANCE_FEE_5_NEW_MONEY               0.224 0.001 0.224 0.001
-score AD_PREFS                              0.499 0.498 0.499 0.498
-score ALIBABA_IMG_NOT_RCVD_ALI              2.498 0.716 2.498 0.716
-score AMAZON_IMG_NOT_RCVD_AMZN              2.497 0.001 2.497 0.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 APP_DEVELOPMENT_FREEM                 1.000 1.000 1.000 1.000
-score APP_DEVELOPMENT_NORDNS                1.997 0.631 1.997 0.631
+score APP_DEVELOPMENT_NORDNS                1.586 0.442 1.586 0.442
 score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.507 0.561 0.507 0.561
-score BIGNUM_EMAILS_FREEM                   2.996 1.494 2.996 1.494
-score BIGNUM_EMAILS_MANY                    2.996 1.000 2.996 1.000
+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 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.496 3.496 3.496 3.496
+score BITCOIN_MALF_HTML                     3.499 3.496 3.499 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.996 2.996 2.996 2.996
+score BITCOIN_ONAN                          2.999 2.997 2.999 2.997
 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.497 1.301 2.497 1.301
-score BITCOIN_SPAM_03                       2.497 1.811 2.497 1.811
+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_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.496 3.499 3.496 3.499
+score BITCOIN_SPAM_07                       3.499 3.092 3.499 3.092
 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.854 0.112 0.854 0.112
-score BITCOIN_YOUR_INFO                     2.996 2.305 2.996 2.305
+score BITCOIN_XPRIO                         0.001 0.223 0.001 0.223
+score BITCOIN_YOUR_INFO                     2.999 2.305 2.999 2.305
 score BODY_URI_ONLY                         1.000 0.001 1.000 0.001
-score BOGUS_MIME_VERSION                    3.496 3.267 3.496 3.267
-score BOGUS_MSM_HDRS                        1.000 1.000 1.000 1.000
+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 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.998 1.000 0.998 1.000
+score BULK_RE_SUSP_NTLD                     0.999 1.000 0.999 1.000
 score CANT_SEE_AD                           1.000 1.000 1.000 1.000
-score CK_HELO_GENERIC                       0.249 0.014 0.249 0.014
+score CK_HELO_GENERIC                       0.249 0.008 0.249 0.008
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
-score CONTENT_AFTER_HTML                    2.497 2.427 2.497 2.427
-score CTE_8BIT_MISMATCH                     0.998 0.001 0.998 0.001
+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 DAY_I_EARNED                          1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY                      0.649 2.796 0.649 2.796
-score DETAILS_OF_PRODUCT                    1.248 1.249 1.248 1.249
-score DKIMWL_BL                             0.001 2.314 0.001 2.314
+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 DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH                        0.001 -0.718 0.001 -0.718
+score DKIMWL_WL_HIGH                        0.001 -0.719 0.001 -0.719
 score DKIMWL_WL_MED                         0.001 -0.001 0.001 -0.001
-score DKIMWL_WL_MEDHI                       0.001 -0.187 0.001 -0.187
+score DKIMWL_WL_MEDHI                       0.001 -0.672 0.001 -0.672
 score DOTGOV_IMAGE                          1.000 1.000 1.000 1.000
-score DX_TEXT_03                            0.898 0.698 0.898 0.698
-score DYNAMIC_IMGUR                         2.862 2.001 2.862 2.001
-score EBAY_IMG_NOT_RCVD_EBAY                1.448 0.465 1.448 0.465
-score ENCRYPTED_MESSAGE                     -0.898 -0.999 -0.898 -0.999
+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 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.997 1.997 1.997 1.997
-score FAKE_REPLY_A1                         3.895 3.417 3.895 3.417
-score FAKE_REPLY_B                          3.895 3.695 3.895 3.695
+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 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.197 0.001 1.197 0.001
-score FONT_INVIS_DIRECT                     2.400 0.001 2.400 0.001
-score FONT_INVIS_DOTGOV                     3.496 3.496 3.496 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.837 2.497 1.837
-score FONT_INVIS_NORDNS                     1.422 1.850 1.422 1.850
+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_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.246 0.948 3.246 0.948
-score FREEMAIL_FORGED_FROMDOMAIN            0.248 0.248 0.248 0.248
+score FOUND_YOU                             3.249 0.302 3.249 0.302
+score FREEMAIL_FORGED_FROMDOMAIN            0.250 0.248 0.250 0.248
 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.196 2.944 3.196 2.944
-score FROM_2_EMAILS_SHORT                   2.614 2.996 2.614 2.996
+score FROMSPACE                             3.200 2.534 3.200 2.534
+score FROM_2_EMAILS_SHORT                   2.650 2.996 2.650 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.798 0.001 0.798
-score FROM_GOV_DKIM_AU                      0.001 -0.735 0.001 -0.735
+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_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_MISSPACED                        1.164 0.001 1.164 0.001
-score FROM_MISSP_DYNIP                      0.001 2.197 0.001 2.197
+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_MISSP_EH_MATCH                   0.001 0.001 0.001 0.001
-score FROM_MISSP_FREEMAIL                   3.234 0.001 3.234 0.001
+score FROM_MISSP_FREEMAIL                   2.502 0.001 2.502 0.001
 score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
-score FROM_MISSP_PHISH                      3.496 3.497 3.496 3.497
+score FROM_MISSP_PHISH                      3.499 3.496 3.499 3.496
 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.358 2.410 0.358 2.410
-score FROM_NAME_EQ_TO_G_DRIVE               0.291 0.136 0.291 0.136
+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_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 1.605 1.999 1.605
+score FROM_NTLD_REPLY_FREEMAIL              1.999 0.594 1.999 0.594
 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.499 0.499 0.499 0.499
-score FROM_SUSPICIOUS_NTLD_FP               1.997 1.038 1.997 1.038
-score FSL_BULK_SIG                          0.001 2.616 0.001 2.616
+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 FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
-score FSL_HELO_FAKE                         3.096 2.896 3.096 2.896
+score FSL_HELO_FAKE                         3.100 2.896 3.100 2.896
 score FSL_NEW_HELO_USER                     0.001 0.001 0.001 0.001
-score FUZZY_AMAZON                          2.397 2.197 2.397 2.197
+score FUZZY_AMAZON                          2.399 2.198 2.399 2.198
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
-score GB_FAKE_RF_SHORT                      0.354 1.998 0.354 1.998
+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.498 0.498 0.498 0.498
-score GB_FREEMAIL_DISPTO_NOTFREEM           0.498 0.498 0.498 0.498
+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_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.498 2.996 2.498 2.996
+score GOOGLE_DOC_SUSP                       2.501 2.996 2.501 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.592 2.996 2.592 2.996
-score GOOG_STO_EMAIL_PHISH                  2.258 2.519 2.258 2.519
-score GOOG_STO_HTML_PHISH                   2.807 2.353 2.807 2.353
-score GOOG_STO_HTML_PHISH_MANY              1.293 3.331 1.293 3.331
-score GOOG_STO_IMG_HTML                     2.996 2.996 2.996 2.996
+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_STO_IMG_NOHTML                   1.000 1.000 1.000 1.000
-score GOOG_STO_NOIMG_HTML                   2.996 2.996 2.996 2.996
+score GOOG_STO_NOIMG_HTML                   2.999 2.996 2.999 2.996
 score HAS_X_NO_RELAY                        1.000 1.000 1.000 1.000
-score HAS_X_OUTGOING_SPAM_STAT              1.997 1.134 1.997 1.134
-score HDRS_LCASE_IMGONLY                    0.098 0.001 0.098 0.001
-score HDRS_MISSP                            2.128 0.001 2.128 0.001
-score HDR_ORDER_FTSDMCXX_DIRECT             0.001 0.001 0.001 0.001
+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 HDR_ORDER_FTSDMCXX_NORDNS             0.001 0.001 0.001 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS         0.249 0.248 0.249 0.248
+score HEADER_FROM_DIFFERENT_DOMAINS         0.250 0.249 0.250 0.249
 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.498 0.795 1.498 0.795
-score HK_NAME_MR_MRS                        0.998 0.150 0.998 0.150
-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.590 0.998 0.590
+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_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
-score HK_SCAM                               1.045 0.001 1.045 0.001
+score HK_SCAM                               0.543 0.001 0.543 0.001
 score HK_WIN                                1.000 1.000 1.000 1.000
-score HOSTED_IMG_DIRECT_MX                  1.933 2.144 1.933 2.144
+score HOSTED_IMG_DIRECT_MX                  1.859 2.505 1.859 2.505
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM                      3.496 3.496 3.496 3.496
-score HOSTED_IMG_MULTI                      1.000 1.000 1.000 1.000
-score HOSTED_IMG_MULTI_PUB_01               2.996 2.996 2.996 2.996
+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 HTML_ENTITY_ASCII_TINY                1.000 1.000 1.000 1.000
-score HTML_OFF_PAGE                         2.996 2.320 2.996 2.320
+score HTML_OFF_PAGE                         2.999 1.813 2.999 1.813
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY                     1.000 1.929 1.000 1.929
-score HTML_TEXT_INVISIBLE_FONT              1.000 0.001 1.000 0.001
-score HTML_TEXT_INVISIBLE_STYLE             3.496 2.095 3.496 2.095
+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.496 3.496 3.496 3.496
+score JH_SPAMMY_HEADERS                     3.499 3.496 3.499 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.399 0.400 0.399
-score LINKEDIN_IMG_NOT_RCVD_LNKN            2.497 2.447 2.497 2.447
+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 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.997 0.950 2.997 0.950
-score LONG_IMG_URI                          0.497 0.938 0.497 0.938
-score LONG_INVISIBLE_TEXT                   1.786 0.172 1.786 0.172
+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 LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
-score LOTTO_AGENT                           1.499 1.498 1.499 1.498
+score LOTTO_AGENT                           1.000 1.498 1.000 1.498
 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.107 0.368 2.107 0.368
+score MALWARE_NORDNS                        2.102 0.443 2.102 0.443
 score MALWARE_PASSWORD                      1.000 1.000 1.000 1.000
-score MANY_SPAN_IN_TEXT                     2.497 2.297 2.497 2.297
-score MILLION_HUNDRED                       3.096 2.896 3.096 2.896
+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.044 0.317 1.044 0.317
+score MIMEOLE_DIRECT_TO_MX                  1.013 0.231 1.013 0.231
 score MIME_NO_TEXT                          1.000 1.000 1.000 1.000
-score MIXED_AREA_CASE                       1.132 1.544 1.132 1.544
-score MIXED_CENTER_CASE                     0.814 1.174 0.814 1.174
-score MIXED_ES                              2.996 2.626 2.996 2.626
-score MIXED_FONT_CASE                       1.477 2.101 1.477 2.101
-score MIXED_HREF_CASE                       0.989 1.443 0.989 1.443
-score MIXED_IMG_CASE                        0.752 0.346 0.752 0.346
+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 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                        0.001 0.001 0.001 0.001
-score MONEY_FORM                            0.001 0.001 0.001 0.001
-score MONEY_FORM_SHORT                      1.381 0.001 1.381 0.001
+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_FRAUD_3                         0.001 0.001 0.001 0.001
-score MONEY_FRAUD_5                         0.001 0.001 0.001 0.001
-score MONEY_FRAUD_8                         0.769 0.001 0.769 0.001
-score MONEY_FREEMAIL_REPTO                  2.996 1.212 2.996 1.212
-score MONEY_FROM_41                         1.997 1.997 1.997 1.997
+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_FROM_MISSP                      0.001 0.001 0.001 0.001
-score MONEY_NOHTML                          1.249 1.119 1.249 1.119
+score MONEY_NOHTML                          1.554 1.117 1.554 1.117
 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                       1.679 1.040 1.679 1.040
-score MSMAIL_PRI_ABNORMAL                   0.503 1.126 0.503 1.126
+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 MSM_PRIO_REPTO                        1.000 1.000 1.000 1.000
-score NAME_EMAIL_DIFF                       1.879 2.436 1.879 2.436
-score NA_DOLLARS                            0.696 0.384 0.696 0.384
+score NAME_EMAIL_DIFF                       1.850 2.443 1.850 2.443
+score NA_DOLLARS                            1.434 0.451 1.434 0.451
 score NEWEGG_IMG_NOT_RCVD_NEGG              1.000 1.000 1.000 1.000
-score NEW_PRODUCTS                          1.248 1.248 1.248 1.248
-score NICE_REPLY_A                          -0.248 -0.430 -0.248 -0.430
-score NOT_SPAM                              3.196 2.996 3.196 2.996
-score NO_FM_NAME_IP_HOSTN                   0.542 0.490 0.542 0.490
+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 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.616 0.705 0.616 0.705
+score NUMBEREND_LINKBAIT                    0.343 0.346 0.343 0.346
 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.996 2.562 2.996 2.562
-score OFFER_ONLY_AMERICA                    1.389 1.000 1.389 1.000
-score ONLINE_MKTG_CNSLT                     2.596 2.297 2.596 2.297
-score ORDER_TODAY                           1.640 0.365 1.640 0.365
-score PDS_BTC_ID                            0.498 0.498 0.498 0.498
+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 PDS_BTC_MSGID                         0.001 0.001 0.001 0.001
-score PDS_BTC_NTLD                          1.999 1.371 1.999 1.371
-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.129 1.498 1.129 1.498
-score PDS_FROM_NAME_TO_DOMAIN               1.997 1.998 1.997 1.998
+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_HELO_SPF_FAIL                     0.001 1.000 0.001 1.000
-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_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_RDNS_DYNAMIC_FP                   0.001 0.001 0.001 0.001
-score PDS_SHORTFWD_URISHRT_FP               1.498 1.032 1.498 1.032
-score PDS_SHORTFWD_URISHRT_QP               1.000 1.000 1.000 1.000
-score PDS_TINYSUBJ_URISHRT                  1.498 1.498 1.498 1.498
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.997 1.997 1.997 1.997
-score PDS_TO_EQ_FROM_NAME                   3.197 3.099 3.197 3.099
+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 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.248 0.584 2.248 0.584
-score PHP_ORIG_SCRIPT_EVAL                  2.996 2.996 2.996 2.996
-score PHP_SCRIPT                            2.497 2.158 2.497 2.158
+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_SCRIPT_MUA                        1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT               0.998 0.998 0.998 0.998
+score PP_MIME_FAKE_ASCII_TEXT               0.999 0.998 0.999 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.996 2.996 2.996 2.996
+score RAND_HEADER_LIST_SPOOF                2.999 2.996 2.999 2.996
 score RAND_HEADER_MANY                      1.000 1.000 1.000 1.000
-score RAND_MKTG_HEADER                      1.997 1.997 1.997 1.997
-score RATWARE_NO_RDNS                       2.435 1.663 2.435 1.663
+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 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
@@ -302,14 +307,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.999 0.583 2.999 0.583
-score READY_TO_SHIP                         1.248 1.248 1.248 1.248
-score REPTO_419_FRAUD                       2.260 2.827 2.260 2.827
+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 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.996 2.519 2.996 2.519
-score REPTO_419_FRAUD_GM_LOOSE              0.998 0.998 0.998 0.998
+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_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
@@ -318,89 +324,90 @@
 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.096 2.896 3.096 2.896
-score SCC_NEWBIE_HASBEENS                   1.659 1.254 1.659 1.254
-score SENDGRID_REDIR                        1.498 1.097 1.498 1.097
+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 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.936 4.095 2.936 4.095
-score SHOPIFY_IMG_NOT_RCVD_SFY              2.497 2.497 2.497 2.497
-score SHORTENER_SHORT_IMG                   2.499 2.170 2.499 2.170
-score SHORT_BODY_G_DRIVE_DYN                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 SHORT_IMG_SUSP_NTLD                   1.000 1.000 1.000 1.000
-score SHORT_SHORTNER                        1.997 0.718 1.997 0.718
-score SPOOFED_FREEMAIL                      0.001 1.224 0.001 1.224
+score SHORT_SHORTNER                        1.999 0.715 1.999 0.715
+score SPOOFED_FREEMAIL                      0.001 1.221 0.001 1.221
 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 1.033 0.001 1.033
+score SPOOFED_FREEM_REPTO_CHN               0.001 3.379 0.001 3.379
 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.997 1.997 1.997 1.997
+score STATIC_XPRIO_OLE                      1.191 1.997 1.191 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.997 1.997 1.997 1.997
-score THIS_AD                               1.198 0.898 1.198 0.898
-score THIS_IS_ADV_SUSP_NTLD                 1.499 1.000 1.499 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 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.098 0.098 0.098 0.098
-score TO_NAME_SUBJ_NO_RDNS                  2.764 2.254 2.764 2.254
-score TO_NO_BRKTS_FROM_MSSP                 2.497 0.001 2.497 0.001
-score TO_NO_BRKTS_HTML_IMG                  1.997 0.001 1.997 0.001
-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.224 1.997 1.224
-score TO_NO_BRKTS_PCNT                      2.497 2.497 2.497 2.497
-score TRANSFORM_LIFE                        2.497 2.497 2.497 2.497
-score TVD_PH_BODY_META                      2.996 2.796 2.996 2.796
-score TVD_RCVD_SPACE_BRACKET                2.796 1.982 2.796 1.982
+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 TVD_SPACE_ENCODED                     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.996 2.696 2.996 2.696
-score UNDISC_MONEY                          3.296 3.096 3.296 3.096
+score UNDISC_FREEM                          2.999 2.696 2.999 2.696
+score UNDISC_MONEY                          3.399 3.096 3.399 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.295 4.195 4.295 4.195
-score URI_DOTEDU                            1.442 1.430 1.442 1.430
+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_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
-score URI_DQ_UNSUB                          2.596 2.219 2.596 2.219
-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_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_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.497 2.499 2.497 2.499
+score URI_LONG_REPEAT                       2.499 2.422 2.499 2.422
 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                             3.995 3.309 3.995 3.309
-score URI_PHP_REDIR                         3.496 3.497 3.496 3.497
-score URI_TRY_3LD                           1.940 1.997 1.940 1.997
+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_TRY_USME                          1.000 1.000 1.000 1.000
-score URI_WPADMIN                           2.696 2.397 2.696 2.397
+score URI_WPADMIN                           2.699 2.397 2.699 2.397
 score URI_WP_DIRINDEX                       1.000 1.000 1.000 1.000
-score URI_WP_HACKED                         1.000 0.115 1.000 0.115
-score URI_WP_HACKED_2                       2.497 2.497 2.497 2.497
+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 USB_DRIVES                            1.000 1.000 1.000 1.000
-score VFY_ACCT_NORDNS                       0.152 2.046 0.152 2.046
+score VFY_ACCT_NORDNS                       0.400 2.061 0.400 2.061
 score VPS_NO_NTLD                           1.000 1.000 1.000 1.000
-score WALMART_IMG_NOT_RCVD_WAL              1.309 1.369 1.309 1.369
-score WANT_TO_ORDER                         2.746 2.035 2.746 2.035
+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 WORD_INVIS                            1.000 1.000 1.000 1.000
-score WORD_INVIS_MANY                       2.768 2.996 2.768 2.996
+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.117 0.001 0.117 0.001
-score XM_RANDOM                             2.497 0.926 2.497 0.926
-score XM_RECPTID                            2.996 2.996 2.996 2.996
+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 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.998 0.998 0.998 0.998
-score YOUR_DELIVERY_ADDRESS                 1.248 0.298 1.248 0.298
-score YOU_INHERIT                           2.696 2.398 2.696 2.398
+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
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index b691fd1..4e1e033 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,227 +1,228 @@
-# Using score set 0 logs for revision 1891787 from:
-# ham-darxus.r1891787.log ham-ena-week0.r1891787.log ham-ena-week1.r1891787.log ham-ena-week2.r1891787.log ham-ena-week3.r1891787.log ham-ena-week4.r1891787.log ham-giovanni-ham.r1891787.log ham-giovanni-spammy.r1891787.log ham-giovanni-spam.r1891787.log ham-grenier.r1891787.log ham-hege.r1891787.log ham-jhardin.r1891787.log ham-llanga.r1891787.log ham-mmiroslaw-mails-ham.r1891787.log ham-mmiroslaw-mails-spam.r1891787.log ham-pds.r1891787.log ham-spamsponge.r1891787.log ham-thendrikx.r1891787.log ham-tsz-spam-corpus.r1891787.log spam-darxus.r1891787.log spam-ena-week0.r1891787.log spam-ena-week1.r1891787.log spam-ena-week2.r1891787.log spam-ena-week3.r1891787.log spam-ena-week4.r1891787.log spam-giovanni-ham.r1891787.log spam-giovanni-spammy.r1891787.log spam-giovanni-spam.r1891787.log spam-grenier.r1891787.log spam-hege.r1891787.log spam-jhardin.r1891787.log spam-llanga.r1891787.log spam-mmiroslaw-mails-ham.r1891787.log spam-mmiroslaw-mails-spam.r1891787.log spam-pds.r1891787.log spam-spamsponge.r1891787.log spam-thendrikx.r1891787.log spam-tsz-spam-corpus.r1891787.log
+# 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
 
-score ACCT_PHISHING_MANY             2.996
+score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
-score AC_FROM_MANY_DOTS              2.996
-score AC_HTML_NONSENSE_TAGS          1.997
-score ADMITS_SPAM                    3.595
-score ADVANCE_FEE_2_NEW_FORM         0.372
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
-score ADVANCE_FEE_2_NEW_MONEY        1.997
-score ADVANCE_FEE_3_NEW              3.239
-score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_3_NEW_MONEY        2.042
-score ADVANCE_FEE_4_NEW              2.596
-score ADVANCE_FEE_4_NEW_MONEY        1.632
-score ADVANCE_FEE_5_NEW              2.696
-score ADVANCE_FEE_5_NEW_FRM_MNY      1.500
-score ADVANCE_FEE_5_NEW_MONEY        0.224
-score AD_PREFS                       0.499
-score ALIBABA_IMG_NOT_RCVD_ALI       2.498
-score AMAZON_IMG_NOT_RCVD_AMZN       2.497
-score APP_DEVELOPMENT_NORDNS         1.997
+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 AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.507
-score BIGNUM_EMAILS_FREEM            2.996
-score BIGNUM_EMAILS_MANY             2.996
-score BITCOIN_MALF_HTML              3.496
-score BITCOIN_ONAN                   2.996
-score BITCOIN_SPAM_02                2.497
-score BITCOIN_SPAM_03                2.497
-score BITCOIN_SPAM_07                3.496
-score BITCOIN_XPRIO                  0.854
-score BITCOIN_YOUR_INFO              2.996
-score BOGUS_MIME_VERSION             3.496
-score BULK_RE_SUSP_NTLD              0.998
+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 CK_HELO_GENERIC                0.249
-score CONTENT_AFTER_HTML             2.497
-score CTE_8BIT_MISMATCH              0.998
-score DEAR_BENEFICIARY               0.649
-score DETAILS_OF_PRODUCT             1.248
-score DX_TEXT_03                     0.898
-score DYNAMIC_IMGUR                  2.862
-score EBAY_IMG_NOT_RCVD_EBAY         1.448
-score ENCRYPTED_MESSAGE              -0.898
-score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  3.895
-score FAKE_REPLY_B                   3.895
-score FILL_THIS_FORM                 1.197
-score FONT_INVIS_DIRECT              2.400
-score FONT_INVIS_DOTGOV              3.496
-score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_LONG_LINE           2.996
-score FONT_INVIS_MSGID               2.497
-score FONT_INVIS_NORDNS              1.422
+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 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 FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.246
-score FREEMAIL_FORGED_FROMDOMAIN     0.248
-score FROMSPACE                      3.196
-score FROM_2_EMAILS_SHORT            2.614
-score FROM_MISSPACED                 1.164
-score FROM_MISSP_DYNIP               0.001
-score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            3.234
-score FROM_MISSP_MSFT                0.001 # force non-zero
-score FROM_MISSP_PHISH               3.496
+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 FROM_MISSP_MSFT                0.001
+score FROM_MISSP_PHISH               3.499
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              0.358
-score FROM_NAME_EQ_TO_G_DRIVE        0.291
+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.499
-score FROM_SUSPICIOUS_NTLD_FP        1.997
+score FROM_SUSPICIOUS_NTLD           0.500
+score FROM_SUSPICIOUS_NTLD_FP        1.999
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  3.096
+score FSL_HELO_FAKE                  3.100
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.397
-score GB_FAKE_RF_SHORT               0.354
-score GB_FREEMAIL_DISPTO             0.498
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
-score GOOGLE_DOC_SUSP                2.498
-score GOOG_REDIR_NORDNS              2.592
-score GOOG_STO_EMAIL_PHISH           2.258
-score GOOG_STO_HTML_PHISH            2.807
-score GOOG_STO_HTML_PHISH_MANY       1.293
-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                     2.128
-score HDR_ORDER_FTSDMCXX_DIRECT      0.001
+score FUZZY_AMAZON                   2.399
+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 HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
-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                        1.045
-score HOSTED_IMG_DIRECT_MX           1.933
-score HOSTED_IMG_FREEM               3.496
-score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_OFF_PAGE                  2.996
-score HTML_TEXT_INVISIBLE_STYLE      3.496
-score JH_SPAMMY_HEADERS              3.496
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.497
-score LONG_HEX_URI                   2.997
-score LONG_IMG_URI                   0.497
-score LONG_INVISIBLE_TEXT            1.786
+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 LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.499
-score MALWARE_NORDNS                 2.107
-score MANY_SPAN_IN_TEXT              2.497
-score MILLION_HUNDRED                3.096
+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.044
-score MIXED_AREA_CASE                1.132
-score MIXED_CENTER_CASE              0.814
-score MIXED_ES                       2.996
-score MIXED_FONT_CASE                1.477
-score MIXED_HREF_CASE                0.989
-score MIXED_IMG_CASE                 0.752
-score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
-score MONEY_FORM_SHORT               1.381
+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 MONEY_FRAUD_3                  0.001
-score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  0.769
-score MONEY_FREEMAIL_REPTO           2.996
-score MONEY_FROM_41                  1.997
+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_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.249
-score MSGID_WSP_TRAIL                1.679
-score MSMAIL_PRI_ABNORMAL            0.503
-score NAME_EMAIL_DIFF                1.879
-score NA_DOLLARS                     0.696
-score NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.248
-score NOT_SPAM                       3.196
-score NO_FM_NAME_IP_HOSTN            0.542
+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 NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.616
+score NUMBEREND_LINKBAIT             0.343
 score OBFU_TEXT_ATTACH               0.001
-score ODD_FREEM_REPTO                2.996
-score OFFER_ONLY_AMERICA             1.389
-score ONLINE_MKTG_CNSLT              2.596
-score ORDER_TODAY                    1.640
-score PDS_BTC_ID                     0.498
+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 PDS_BTC_MSGID                  0.001
 score PDS_BTC_NTLD                   1.999
-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.129
-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_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_RDNS_DYNAMIC_FP            0.001 # force non-zero
-score PDS_SHORTFWD_URISHRT_FP        1.498
-score PDS_TINYSUBJ_URISHRT           1.498
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
-score PDS_TO_EQ_FROM_NAME            3.197
-score PHP_ORIG_SCRIPT                2.248
-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                2.435
-score RDNS_NUM_TLD_XM                2.999
-score READY_TO_SHIP                  1.248
-score REPTO_419_FRAUD                2.260
-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.659
-score SENDGRID_REDIR                 1.498
-score SERGIO_SUBJECT_VIAGRA01        2.936
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_IMG            2.499
-score SHORT_SHORTNER                 1.997
-score STATIC_XPRIO_OLE               1.997
-score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
-score THIS_AD                        1.198
-score THIS_IS_ADV_SUSP_NTLD          1.499
-score TO_EQ_FM_DIRECT_MX             0.001
-score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.764
-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.497
-score TRANSFORM_LIFE                 2.497
-score TVD_PH_BODY_META               2.996
-score TVD_RCVD_SPACE_BRACKET         2.796
-score UNDISC_FREEM                   2.996
-score UNDISC_MONEY                   3.296
-score URI_DEOBFU_INSTR               4.295
-score URI_DOTEDU                     1.442
-score URI_DQ_UNSUB                   2.596
-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.940
-score URI_WPADMIN                    2.696
-score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                0.152
-score WALMART_IMG_NOT_RCVD_WAL       1.309
-score WANT_TO_ORDER                  2.746
-score WORD_INVIS_MANY                2.768
+score PDS_SHORTFWD_URISHRT_FP        1.499
+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 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.117
-score XM_RANDOM                      2.497
-score XM_RECPTID                     2.996
-score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          1.248
-score YOU_INHERIT                    2.696
+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 AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -234,6 +235,7 @@
 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
@@ -251,14 +253,15 @@
 score BITCOIN_SPAM_11                1.000
 score BITCOIN_SPAM_12                1.000
 score BODY_URI_ONLY                  1.000
-score BOGUS_MSM_HDRS                 1.000
 score BOMB_FREEM                     1.000
 score BOMB_MONEY                     1.000
 score BTC_ORG                        1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
+score COMPENSATION                   1.000
 score DAY_I_EARNED                   1.000
 score DOTGOV_IMAGE                   1.000
+score DYNAMIC_IMGUR                  1.000
 score END_FUTURE_EMAILS              1.000
 score ENVFROM_GOOG_TRIX              1.000
 score FBI_MONEY                      1.000
@@ -272,6 +275,7 @@
 score FROM_NTLD_LINKBAIT             1.000
 score FROM_NUMERIC_TLD               1.000
 score GAPPY_SALES_LEADS_FREEM        1.000
+score GB_FAKE_RF_SHORT               1.000
 score GB_FORGED_MUA_POSTFIX          1.000
 score GB_GOOGLE_OBFUR                0.750
 score GOOGLE_DOCS_PHISH              1.000
@@ -280,12 +284,12 @@
 score GOOG_MALWARE_DNLD              1.000
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 1.000
+score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
 score HK_WIN                         1.000
 score HOSTED_IMG_DQ_UNSUB            1.000
-score HOSTED_IMG_MULTI               1.000
 score HTML_ENTITY_ASCII              1.000
 score HTML_ENTITY_ASCII_TINY         1.000
 score HTML_SHRT_CMNT_OBFU_MANY       1.000
@@ -297,6 +301,7 @@
 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
@@ -310,7 +315,7 @@
 score MSM_PRIO_REPTO                 1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
-score PDS_SHORTFWD_URISHRT_QP        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
@@ -338,15 +343,17 @@
 score REPTO_419_FRAUD_YN             1.000
 score SENDGRID_REDIR_PHISH           1.000
 score SEO_SUSP_NTLD                  1.000
-score SHORT_BODY_G_DRIVE_DYN         1.000
 score SHORT_IMG_SUSP_NTLD            1.000
 score SPOOFED_FREEMAIL_NO_RDNS       1.000
 score SPOOF_GMAIL_MID                1.000
 score STOCK_LOW_CONTRAST             1.000
 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_NO_BRKTS_MSFT               1.000
+score TO_NAME_SUBJ_NO_RDNS           1.000
+score TVD_SPACE_ENCODED              1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ASC               1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index ccaeb68..84f495c 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -7,12 +7,12 @@
 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         0.098
+score ADVANCE_FEE_2_NEW_FORM         1.361
 score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
 score ADVANCE_FEE_2_NEW_MONEY        0.001
-score ADVANCE_FEE_3_NEW              3.400
+score ADVANCE_FEE_3_NEW              3.408
 score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_3_NEW_MONEY        0.986
+score ADVANCE_FEE_3_NEW_MONEY        0.981
 score ADVANCE_FEE_4_NEW              2.397
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_4_NEW_MONEY        0.001
@@ -20,238 +20,239 @@
 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       0.716
+score ALIBABA_IMG_NOT_RCVD_ALI       1.351
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         0.631
+score APP_DEVELOPMENT_NORDNS         0.442
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.561
-score BIGNUM_EMAILS_FREEM            1.494
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.722
+score BIGNUM_EMAILS_FREEM            2.144
 score BITCOIN_MALF_HTML              3.496
 score BITCOIN_MALWARE                0.001
-score BITCOIN_ONAN                   2.996
-score BITCOIN_SPAM_02                1.301
-score BITCOIN_SPAM_03                1.811
+score BITCOIN_ONAN                   2.997
+score BITCOIN_SPAM_02                1.248
+score BITCOIN_SPAM_03                2.153
 score BITCOIN_SPAM_05                2.497
-score BITCOIN_SPAM_07                3.499
-score BITCOIN_XPRIO                  0.112
+score BITCOIN_SPAM_07                3.092
+score BITCOIN_XPRIO                  0.223
 score BITCOIN_YOUR_INFO              2.305
 score BODY_URI_ONLY                  0.001
-score BOGUS_MIME_VERSION             3.267
-score CK_HELO_GENERIC                0.014
-score CONTENT_AFTER_HTML             2.427
+score BOGUS_MIME_VERSION             3.183
+score CK_HELO_GENERIC                0.008
+score CONTENT_AFTER_HTML             2.417
 score CTE_8BIT_MISMATCH              0.001
-score DEAR_BENEFICIARY               2.796
-score DETAILS_OF_PRODUCT             1.249
-score DKIMWL_BL                      2.314
-score DKIMWL_WL_HIGH                 -0.718
+score DEAR_BENEFICIARY               2.896
+score DETAILS_OF_PRODUCT             1.248
+score DKIMWL_BL                      2.313
+score DKIMWL_WL_HIGH                 -0.719
 score DKIMWL_WL_MED                  -0.001
-score DKIMWL_WL_MEDHI                -0.187
+score DKIMWL_WL_MEDHI                -0.672
 score DX_TEXT_03                     0.698
-score DYNAMIC_IMGUR                  2.001
-score EBAY_IMG_NOT_RCVD_EBAY         0.465
-score ENCRYPTED_MESSAGE              -0.999
+score DYNAMIC_IMGUR                  3.815
+score EBAY_IMG_NOT_RCVD_EBAY         1.130
+score ENCRYPTED_MESSAGE              -0.998
 score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  3.417
+score FAKE_REPLY_A1                  3.611
 score FAKE_REPLY_B                   3.695
 score FILL_THIS_FORM                 0.001
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_DOTGOV              3.496
 score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_MSGID               1.837
-score FONT_INVIS_NORDNS              1.850
+score FONT_INVIS_LONG_LINE           2.996
+score FONT_INVIS_MSGID               1.843
+score FONT_INVIS_NORDNS              2.300
 score FORGED_SPF_HELO                1.597
-score FORM_FRAUD                     0.001
+score FORM_FRAUD                     0.001 # force non-zero
 score FORM_FRAUD_3                   2.596
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      0.948
+score FOUND_YOU                      0.302
 score FREEMAIL_FORGED_FROMDOMAIN     0.248
-score FROMSPACE                      2.944
+score FROMSPACE                      2.534
 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.798
-score FROM_GOV_DKIM_AU               -0.735
+score FROM_FMBLA_NEWDOM28            0.799
+score FROM_GOV_DKIM_AU               -0.736
 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
+score FROM_MISSP_FREEMAIL            0.001 # force non-zero
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.497
+score FROM_MISSP_PHISH               3.496
 score FROM_MISSP_SPF_FAIL            0.001
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              2.410
-score FROM_NAME_EQ_TO_G_DRIVE        0.136
-score FROM_NTLD_REPLY_FREEMAIL       1.605
-score FROM_PAYPAL_SPOOF              0.001
-score FROM_SUSPICIOUS_NTLD           0.499
-score FROM_SUSPICIOUS_NTLD_FP        1.038
-score FSL_BULK_SIG                   2.616
+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 FSL_CTYPE_WIN1251              0.001
 score FSL_HELO_FAKE                  2.896
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.197
-score GB_FAKE_RF_SHORT               1.998
-score GB_FREEMAIL_DISPTO             0.498
+score FUZZY_AMAZON                   2.198
+score GB_FAKE_RF_SHORT               1.997
+score GB_FREEMAIL_DISPTO             0.499
 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.519
-score GOOG_STO_HTML_PHISH            2.353
-score GOOG_STO_HTML_PHISH_MANY       3.331
-score GOOG_STO_IMG_HTML              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_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       1.134
-score HDRS_LCASE_IMGONLY             0.001
+score HAS_X_OUTGOING_SPAM_STAT       0.793
+score HDRS_LCASE                     0.099
+score HDRS_LCASE_IMGONLY             0.093
 score HDRS_MISSP                     0.001
-score HDR_ORDER_FTSDMCXX_DIRECT      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.248
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
-score HK_NAME_FM_MR_MRS              0.795
-score HK_NAME_MR_MRS                 0.150
+score HK_NAME_FM_MR_MRS              0.542
+score HK_NAME_MR_MRS                 0.086
 score HK_RANDOM_ENVFROM              0.998
-score HK_RANDOM_FROM                 0.998
-score HK_RANDOM_REPLYTO              0.590
+score HK_RANDOM_FROM                 0.999
+score HK_RANDOM_REPLYTO              0.586
 score HK_SCAM                        0.001
-score HOSTED_IMG_DIRECT_MX           2.144
+score HOSTED_IMG_DIRECT_MX           2.505
 score HOSTED_IMG_FREEM               3.496
 score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_OFF_PAGE                  2.320
-score HTML_SINGLET_MANY              1.929
-score HTML_TEXT_INVISIBLE_FONT       0.001
-score HTML_TEXT_INVISIBLE_STYLE      2.095
+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 JH_SPAMMY_HEADERS              3.496
-score KHOP_FAKE_EBAY                 0.948
-score KHOP_HELO_FCRDNS               0.399
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.447
-score LONG_HEX_URI                   0.950
-score LONG_IMG_URI                   0.938
-score LONG_INVISIBLE_TEXT            0.172
+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 LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    1.498
-score MALWARE_NORDNS                 0.368
+score MALWARE_NORDNS                 0.443
 score MANY_SPAN_IN_TEXT              2.297
 score MILLION_HUNDRED                2.896
 score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           0.317
-score MIXED_AREA_CASE                1.544
-score MIXED_CENTER_CASE              1.174
-score MIXED_ES                       2.626
-score MIXED_FONT_CASE                2.101
-score MIXED_HREF_CASE                1.443
-score MIXED_IMG_CASE                 0.346
+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 MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001
+score MONEY_FORM                     0.001 # force non-zero
 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.212
+score MONEY_FREEMAIL_REPTO           1.216
 score MONEY_FROM_41                  1.997
-score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.119
-score MSGID_WSP_TRAIL                1.040
-score MSMAIL_PRI_ABNORMAL            1.126
-score NAME_EMAIL_DIFF                2.436
-score NA_DOLLARS                     0.384
+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 NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.430
+score NICE_REPLY_A                   -0.277
 score NOT_SPAM                       2.996
-score NO_FM_NAME_IP_HOSTN            0.490
+score NO_FM_NAME_IP_HOSTN            0.486
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.705
-score ODD_FREEM_REPTO                2.562
+score NUMBEREND_LINKBAIT             0.346
+score ODD_FREEM_REPTO                2.722
 score ONLINE_MKTG_CNSLT              2.297
-score ORDER_TODAY                    0.365
+score ORDER_TODAY                    0.405
 score PDS_BTC_ID                     0.498
 score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   1.371
+score PDS_BTC_NTLD                   0.224
 score PDS_FRNOM_TODOM_DBL_URL        1.498
 score PDS_FRNOM_TODOM_NAKED_TO       1.498
 score PDS_FROM_2_EMAILS_SHRTNER      1.498
-score PDS_FROM_NAME_TO_DOMAIN        1.998
+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.032
-score PDS_TINYSUBJ_URISHRT           1.498
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
-score PDS_TO_EQ_FROM_NAME            3.099
-score PHP_ORIG_SCRIPT                0.584
+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 PHP_ORIG_SCRIPT_EVAL           2.996
-score PHP_SCRIPT                     2.158
+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.663
-score RCVD_IN_MSPIKE_H2              -0.001
-score RDNS_NUM_TLD_XM                0.583
+score RATWARE_NO_RDNS                2.354
+score RCVD_IN_MSPIKE_H2              -0.001 # force non-zero
+score RDNS_NUM_TLD_XM                1.994
 score READY_TO_SHIP                  1.248
-score REPTO_419_FRAUD                2.827
-score REPTO_419_FRAUD_GM             2.519
+score REPTO_419_FRAUD                2.999
+score REPTO_419_FRAUD_GM             2.851
 score REPTO_419_FRAUD_GM_LOOSE       0.998
 score RISK_FREE                      2.896
-score SCC_NEWBIE_HASBEENS            1.254
-score SENDGRID_REDIR                 1.097
-score SERGIO_SUBJECT_VIAGRA01        4.095
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_IMG            2.170
-score SHORT_SHORTNER                 0.718
-score SINGLETS_LOW_CONTRAST          1.963
-score SPOOFED_FREEMAIL               1.224
+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 SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            0.001
-score SPOOFED_FREEM_REPTO_CHN        1.033
+score SPOOFED_FREEM_REPTO_CHN        3.379
 score SPOOF_GMAIL_MID                1.498
 score STATIC_XPRIO_OLE               1.997
 score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
-score THIS_AD                        0.898
+score THIS_AD                        0.998
 score TO_EQ_FM_DIRECT_MX             2.497
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
+score TO_EQ_FM_HTML_ONLY             2.297
 score TO_EQ_FM_SPF_FAIL              0.001
 score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.254
+score TO_NAME_SUBJ_NO_RDNS           2.637
 score TO_NO_BRKTS_FROM_MSSP          0.001
-score TO_NO_BRKTS_HTML_IMG           0.001
+score TO_NO_BRKTS_HTML_IMG           0.071
 score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_MSFT               0.001
-score TO_NO_BRKTS_NORDNS_HTML        1.224
+score TO_NO_BRKTS_NORDNS_HTML        1.204
 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.982
-score TVD_SPACE_RATIO_MINFP          0.001
+score TVD_RCVD_SPACE_BRACKET         1.767
+score TVD_SPACE_ENCODED              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.430
-score URI_DQ_UNSUB                   2.219
+score URI_DOTEDU                     1.837
+score URI_DQ_UNSUB                   1.821
 score URI_FIREBASEAPP                2.996
 score URI_GOOGLE_PROXY               2.596
 score URI_GOOG_STO_SPAMMY            2.996
-score URI_LONG_REPEAT                2.499
+score URI_LONG_REPEAT                2.422
 score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      3.309
-score URI_PHP_REDIR                  3.497
+score URI_PHISH                      3.310
+score URI_PHP_REDIR                  3.496
 score URI_TRY_3LD                    1.997
 score URI_WPADMIN                    2.397
-score URI_WP_HACKED                  0.115
+score URI_WP_HACKED                  0.001
 score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                2.046
-score WALMART_IMG_NOT_RCVD_WAL       1.369
-score WANT_TO_ORDER                  2.035
+score VFY_ACCT_NORDNS                2.061
+score WALMART_IMG_NOT_RCVD_WAL       1.682
+score WANT_TO_ORDER                  2.426
 score WORD_INVIS_MANY                2.996
 score XFER_LOTSA_MONEY               0.998
 score XM_DIGITS_ONLY                 0.001
-score XM_RANDOM                      0.926
+score XM_RANDOM                      0.936
 score XM_RECPTID                     2.996
 score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          0.298
-score YOU_INHERIT                    2.398
+score YOUR_DELIVERY_ADDRESS          0.308
+score YOU_INHERIT                    2.127
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -288,6 +289,7 @@
 score BULK_RE_SUSP_NTLD              1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
+score COMPENSATION                   1.000
 score DAY_I_EARNED                   1.000
 score DKIMWL_BLOCKED                 0.001
 score DOTGOV_IMAGE                   1.000
@@ -295,7 +297,6 @@
 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
@@ -346,7 +347,6 @@
 score OFFER_ONLY_AMERICA             1.000
 score PDS_DBL_URL_TNB_RUNON          1.000
 score PDS_HELO_SPF_FAIL              1.000
-score PDS_SHORTFWD_URISHRT_QP        1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHISH_FBASEAPP                 1.000
 score PHOTO_EDITING_DIRECT           1.000
@@ -374,7 +374,6 @@
 score REPTO_419_FRAUD_YN             1.000
 score SENDGRID_REDIR_PHISH           1.000
 score SEO_SUSP_NTLD                  1.000
-score SHORT_BODY_G_DRIVE_DYN         1.000
 score SHORT_IMG_SUSP_NTLD            1.000
 score SPOOFED_FREEM_REPTO_RUS        1.000
 score STOCK_LOW_CONTRAST             1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index b691fd1..4e1e033 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,227 +1,228 @@
-# Using score set 0 logs for revision 1891787 from:
-# ham-darxus.r1891787.log ham-ena-week0.r1891787.log ham-ena-week1.r1891787.log ham-ena-week2.r1891787.log ham-ena-week3.r1891787.log ham-ena-week4.r1891787.log ham-giovanni-ham.r1891787.log ham-giovanni-spammy.r1891787.log ham-giovanni-spam.r1891787.log ham-grenier.r1891787.log ham-hege.r1891787.log ham-jhardin.r1891787.log ham-llanga.r1891787.log ham-mmiroslaw-mails-ham.r1891787.log ham-mmiroslaw-mails-spam.r1891787.log ham-pds.r1891787.log ham-spamsponge.r1891787.log ham-thendrikx.r1891787.log ham-tsz-spam-corpus.r1891787.log spam-darxus.r1891787.log spam-ena-week0.r1891787.log spam-ena-week1.r1891787.log spam-ena-week2.r1891787.log spam-ena-week3.r1891787.log spam-ena-week4.r1891787.log spam-giovanni-ham.r1891787.log spam-giovanni-spammy.r1891787.log spam-giovanni-spam.r1891787.log spam-grenier.r1891787.log spam-hege.r1891787.log spam-jhardin.r1891787.log spam-llanga.r1891787.log spam-mmiroslaw-mails-ham.r1891787.log spam-mmiroslaw-mails-spam.r1891787.log spam-pds.r1891787.log spam-spamsponge.r1891787.log spam-thendrikx.r1891787.log spam-tsz-spam-corpus.r1891787.log
+# 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
 
-score ACCT_PHISHING_MANY             2.996
+score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
-score AC_FROM_MANY_DOTS              2.996
-score AC_HTML_NONSENSE_TAGS          1.997
-score ADMITS_SPAM                    3.595
-score ADVANCE_FEE_2_NEW_FORM         0.372
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
-score ADVANCE_FEE_2_NEW_MONEY        1.997
-score ADVANCE_FEE_3_NEW              3.239
-score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_3_NEW_MONEY        2.042
-score ADVANCE_FEE_4_NEW              2.596
-score ADVANCE_FEE_4_NEW_MONEY        1.632
-score ADVANCE_FEE_5_NEW              2.696
-score ADVANCE_FEE_5_NEW_FRM_MNY      1.500
-score ADVANCE_FEE_5_NEW_MONEY        0.224
-score AD_PREFS                       0.499
-score ALIBABA_IMG_NOT_RCVD_ALI       2.498
-score AMAZON_IMG_NOT_RCVD_AMZN       2.497
-score APP_DEVELOPMENT_NORDNS         1.997
+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 AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.507
-score BIGNUM_EMAILS_FREEM            2.996
-score BIGNUM_EMAILS_MANY             2.996
-score BITCOIN_MALF_HTML              3.496
-score BITCOIN_ONAN                   2.996
-score BITCOIN_SPAM_02                2.497
-score BITCOIN_SPAM_03                2.497
-score BITCOIN_SPAM_07                3.496
-score BITCOIN_XPRIO                  0.854
-score BITCOIN_YOUR_INFO              2.996
-score BOGUS_MIME_VERSION             3.496
-score BULK_RE_SUSP_NTLD              0.998
+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 CK_HELO_GENERIC                0.249
-score CONTENT_AFTER_HTML             2.497
-score CTE_8BIT_MISMATCH              0.998
-score DEAR_BENEFICIARY               0.649
-score DETAILS_OF_PRODUCT             1.248
-score DX_TEXT_03                     0.898
-score DYNAMIC_IMGUR                  2.862
-score EBAY_IMG_NOT_RCVD_EBAY         1.448
-score ENCRYPTED_MESSAGE              -0.898
-score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  3.895
-score FAKE_REPLY_B                   3.895
-score FILL_THIS_FORM                 1.197
-score FONT_INVIS_DIRECT              2.400
-score FONT_INVIS_DOTGOV              3.496
-score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_LONG_LINE           2.996
-score FONT_INVIS_MSGID               2.497
-score FONT_INVIS_NORDNS              1.422
+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 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 FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.246
-score FREEMAIL_FORGED_FROMDOMAIN     0.248
-score FROMSPACE                      3.196
-score FROM_2_EMAILS_SHORT            2.614
-score FROM_MISSPACED                 1.164
-score FROM_MISSP_DYNIP               0.001
-score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            3.234
-score FROM_MISSP_MSFT                0.001 # force non-zero
-score FROM_MISSP_PHISH               3.496
+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 FROM_MISSP_MSFT                0.001
+score FROM_MISSP_PHISH               3.499
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              0.358
-score FROM_NAME_EQ_TO_G_DRIVE        0.291
+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.499
-score FROM_SUSPICIOUS_NTLD_FP        1.997
+score FROM_SUSPICIOUS_NTLD           0.500
+score FROM_SUSPICIOUS_NTLD_FP        1.999
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  3.096
+score FSL_HELO_FAKE                  3.100
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.397
-score GB_FAKE_RF_SHORT               0.354
-score GB_FREEMAIL_DISPTO             0.498
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
-score GOOGLE_DOC_SUSP                2.498
-score GOOG_REDIR_NORDNS              2.592
-score GOOG_STO_EMAIL_PHISH           2.258
-score GOOG_STO_HTML_PHISH            2.807
-score GOOG_STO_HTML_PHISH_MANY       1.293
-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                     2.128
-score HDR_ORDER_FTSDMCXX_DIRECT      0.001
+score FUZZY_AMAZON                   2.399
+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 HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
-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                        1.045
-score HOSTED_IMG_DIRECT_MX           1.933
-score HOSTED_IMG_FREEM               3.496
-score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_OFF_PAGE                  2.996
-score HTML_TEXT_INVISIBLE_STYLE      3.496
-score JH_SPAMMY_HEADERS              3.496
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.497
-score LONG_HEX_URI                   2.997
-score LONG_IMG_URI                   0.497
-score LONG_INVISIBLE_TEXT            1.786
+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 LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.499
-score MALWARE_NORDNS                 2.107
-score MANY_SPAN_IN_TEXT              2.497
-score MILLION_HUNDRED                3.096
+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.044
-score MIXED_AREA_CASE                1.132
-score MIXED_CENTER_CASE              0.814
-score MIXED_ES                       2.996
-score MIXED_FONT_CASE                1.477
-score MIXED_HREF_CASE                0.989
-score MIXED_IMG_CASE                 0.752
-score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
-score MONEY_FORM_SHORT               1.381
+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 MONEY_FRAUD_3                  0.001
-score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  0.769
-score MONEY_FREEMAIL_REPTO           2.996
-score MONEY_FROM_41                  1.997
+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_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.249
-score MSGID_WSP_TRAIL                1.679
-score MSMAIL_PRI_ABNORMAL            0.503
-score NAME_EMAIL_DIFF                1.879
-score NA_DOLLARS                     0.696
-score NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.248
-score NOT_SPAM                       3.196
-score NO_FM_NAME_IP_HOSTN            0.542
+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 NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.616
+score NUMBEREND_LINKBAIT             0.343
 score OBFU_TEXT_ATTACH               0.001
-score ODD_FREEM_REPTO                2.996
-score OFFER_ONLY_AMERICA             1.389
-score ONLINE_MKTG_CNSLT              2.596
-score ORDER_TODAY                    1.640
-score PDS_BTC_ID                     0.498
+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 PDS_BTC_MSGID                  0.001
 score PDS_BTC_NTLD                   1.999
-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.129
-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_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_RDNS_DYNAMIC_FP            0.001 # force non-zero
-score PDS_SHORTFWD_URISHRT_FP        1.498
-score PDS_TINYSUBJ_URISHRT           1.498
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
-score PDS_TO_EQ_FROM_NAME            3.197
-score PHP_ORIG_SCRIPT                2.248
-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                2.435
-score RDNS_NUM_TLD_XM                2.999
-score READY_TO_SHIP                  1.248
-score REPTO_419_FRAUD                2.260
-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.659
-score SENDGRID_REDIR                 1.498
-score SERGIO_SUBJECT_VIAGRA01        2.936
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_IMG            2.499
-score SHORT_SHORTNER                 1.997
-score STATIC_XPRIO_OLE               1.997
-score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
-score THIS_AD                        1.198
-score THIS_IS_ADV_SUSP_NTLD          1.499
-score TO_EQ_FM_DIRECT_MX             0.001
-score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.764
-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.497
-score TRANSFORM_LIFE                 2.497
-score TVD_PH_BODY_META               2.996
-score TVD_RCVD_SPACE_BRACKET         2.796
-score UNDISC_FREEM                   2.996
-score UNDISC_MONEY                   3.296
-score URI_DEOBFU_INSTR               4.295
-score URI_DOTEDU                     1.442
-score URI_DQ_UNSUB                   2.596
-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.940
-score URI_WPADMIN                    2.696
-score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                0.152
-score WALMART_IMG_NOT_RCVD_WAL       1.309
-score WANT_TO_ORDER                  2.746
-score WORD_INVIS_MANY                2.768
+score PDS_SHORTFWD_URISHRT_FP        1.499
+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 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.117
-score XM_RANDOM                      2.497
-score XM_RECPTID                     2.996
-score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          1.248
-score YOU_INHERIT                    2.696
+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 AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -234,6 +235,7 @@
 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
@@ -251,14 +253,15 @@
 score BITCOIN_SPAM_11                1.000
 score BITCOIN_SPAM_12                1.000
 score BODY_URI_ONLY                  1.000
-score BOGUS_MSM_HDRS                 1.000
 score BOMB_FREEM                     1.000
 score BOMB_MONEY                     1.000
 score BTC_ORG                        1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
+score COMPENSATION                   1.000
 score DAY_I_EARNED                   1.000
 score DOTGOV_IMAGE                   1.000
+score DYNAMIC_IMGUR                  1.000
 score END_FUTURE_EMAILS              1.000
 score ENVFROM_GOOG_TRIX              1.000
 score FBI_MONEY                      1.000
@@ -272,6 +275,7 @@
 score FROM_NTLD_LINKBAIT             1.000
 score FROM_NUMERIC_TLD               1.000
 score GAPPY_SALES_LEADS_FREEM        1.000
+score GB_FAKE_RF_SHORT               1.000
 score GB_FORGED_MUA_POSTFIX          1.000
 score GB_GOOGLE_OBFUR                0.750
 score GOOGLE_DOCS_PHISH              1.000
@@ -280,12 +284,12 @@
 score GOOG_MALWARE_DNLD              1.000
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 1.000
+score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
 score HK_WIN                         1.000
 score HOSTED_IMG_DQ_UNSUB            1.000
-score HOSTED_IMG_MULTI               1.000
 score HTML_ENTITY_ASCII              1.000
 score HTML_ENTITY_ASCII_TINY         1.000
 score HTML_SHRT_CMNT_OBFU_MANY       1.000
@@ -297,6 +301,7 @@
 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
@@ -310,7 +315,7 @@
 score MSM_PRIO_REPTO                 1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
-score PDS_SHORTFWD_URISHRT_QP        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
@@ -338,15 +343,17 @@
 score REPTO_419_FRAUD_YN             1.000
 score SENDGRID_REDIR_PHISH           1.000
 score SEO_SUSP_NTLD                  1.000
-score SHORT_BODY_G_DRIVE_DYN         1.000
 score SHORT_IMG_SUSP_NTLD            1.000
 score SPOOFED_FREEMAIL_NO_RDNS       1.000
 score SPOOF_GMAIL_MID                1.000
 score STOCK_LOW_CONTRAST             1.000
 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_NO_BRKTS_MSFT               1.000
+score TO_NAME_SUBJ_NO_RDNS           1.000
+score TVD_SPACE_ENCODED              1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ASC               1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index ccaeb68..84f495c 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -7,12 +7,12 @@
 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         0.098
+score ADVANCE_FEE_2_NEW_FORM         1.361
 score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
 score ADVANCE_FEE_2_NEW_MONEY        0.001
-score ADVANCE_FEE_3_NEW              3.400
+score ADVANCE_FEE_3_NEW              3.408
 score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_3_NEW_MONEY        0.986
+score ADVANCE_FEE_3_NEW_MONEY        0.981
 score ADVANCE_FEE_4_NEW              2.397
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_4_NEW_MONEY        0.001
@@ -20,238 +20,239 @@
 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       0.716
+score ALIBABA_IMG_NOT_RCVD_ALI       1.351
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         0.631
+score APP_DEVELOPMENT_NORDNS         0.442
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.561
-score BIGNUM_EMAILS_FREEM            1.494
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.722
+score BIGNUM_EMAILS_FREEM            2.144
 score BITCOIN_MALF_HTML              3.496
 score BITCOIN_MALWARE                0.001
-score BITCOIN_ONAN                   2.996
-score BITCOIN_SPAM_02                1.301
-score BITCOIN_SPAM_03                1.811
+score BITCOIN_ONAN                   2.997
+score BITCOIN_SPAM_02                1.248
+score BITCOIN_SPAM_03                2.153
 score BITCOIN_SPAM_05                2.497
-score BITCOIN_SPAM_07                3.499
-score BITCOIN_XPRIO                  0.112
+score BITCOIN_SPAM_07                3.092
+score BITCOIN_XPRIO                  0.223
 score BITCOIN_YOUR_INFO              2.305
 score BODY_URI_ONLY                  0.001
-score BOGUS_MIME_VERSION             3.267
-score CK_HELO_GENERIC                0.014
-score CONTENT_AFTER_HTML             2.427
+score BOGUS_MIME_VERSION             3.183
+score CK_HELO_GENERIC                0.008
+score CONTENT_AFTER_HTML             2.417
 score CTE_8BIT_MISMATCH              0.001
-score DEAR_BENEFICIARY               2.796
-score DETAILS_OF_PRODUCT             1.249
-score DKIMWL_BL                      2.314
-score DKIMWL_WL_HIGH                 -0.718
+score DEAR_BENEFICIARY               2.896
+score DETAILS_OF_PRODUCT             1.248
+score DKIMWL_BL                      2.313
+score DKIMWL_WL_HIGH                 -0.719
 score DKIMWL_WL_MED                  -0.001
-score DKIMWL_WL_MEDHI                -0.187
+score DKIMWL_WL_MEDHI                -0.672
 score DX_TEXT_03                     0.698
-score DYNAMIC_IMGUR                  2.001
-score EBAY_IMG_NOT_RCVD_EBAY         0.465
-score ENCRYPTED_MESSAGE              -0.999
+score DYNAMIC_IMGUR                  3.815
+score EBAY_IMG_NOT_RCVD_EBAY         1.130
+score ENCRYPTED_MESSAGE              -0.998
 score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  3.417
+score FAKE_REPLY_A1                  3.611
 score FAKE_REPLY_B                   3.695
 score FILL_THIS_FORM                 0.001
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_DOTGOV              3.496
 score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_MSGID               1.837
-score FONT_INVIS_NORDNS              1.850
+score FONT_INVIS_LONG_LINE           2.996
+score FONT_INVIS_MSGID               1.843
+score FONT_INVIS_NORDNS              2.300
 score FORGED_SPF_HELO                1.597
-score FORM_FRAUD                     0.001
+score FORM_FRAUD                     0.001 # force non-zero
 score FORM_FRAUD_3                   2.596
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      0.948
+score FOUND_YOU                      0.302
 score FREEMAIL_FORGED_FROMDOMAIN     0.248
-score FROMSPACE                      2.944
+score FROMSPACE                      2.534
 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.798
-score FROM_GOV_DKIM_AU               -0.735
+score FROM_FMBLA_NEWDOM28            0.799
+score FROM_GOV_DKIM_AU               -0.736
 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
+score FROM_MISSP_FREEMAIL            0.001 # force non-zero
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.497
+score FROM_MISSP_PHISH               3.496
 score FROM_MISSP_SPF_FAIL            0.001
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              2.410
-score FROM_NAME_EQ_TO_G_DRIVE        0.136
-score FROM_NTLD_REPLY_FREEMAIL       1.605
-score FROM_PAYPAL_SPOOF              0.001
-score FROM_SUSPICIOUS_NTLD           0.499
-score FROM_SUSPICIOUS_NTLD_FP        1.038
-score FSL_BULK_SIG                   2.616
+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 FSL_CTYPE_WIN1251              0.001
 score FSL_HELO_FAKE                  2.896
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.197
-score GB_FAKE_RF_SHORT               1.998
-score GB_FREEMAIL_DISPTO             0.498
+score FUZZY_AMAZON                   2.198
+score GB_FAKE_RF_SHORT               1.997
+score GB_FREEMAIL_DISPTO             0.499
 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.519
-score GOOG_STO_HTML_PHISH            2.353
-score GOOG_STO_HTML_PHISH_MANY       3.331
-score GOOG_STO_IMG_HTML              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_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       1.134
-score HDRS_LCASE_IMGONLY             0.001
+score HAS_X_OUTGOING_SPAM_STAT       0.793
+score HDRS_LCASE                     0.099
+score HDRS_LCASE_IMGONLY             0.093
 score HDRS_MISSP                     0.001
-score HDR_ORDER_FTSDMCXX_DIRECT      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.248
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
-score HK_NAME_FM_MR_MRS              0.795
-score HK_NAME_MR_MRS                 0.150
+score HK_NAME_FM_MR_MRS              0.542
+score HK_NAME_MR_MRS                 0.086
 score HK_RANDOM_ENVFROM              0.998
-score HK_RANDOM_FROM                 0.998
-score HK_RANDOM_REPLYTO              0.590
+score HK_RANDOM_FROM                 0.999
+score HK_RANDOM_REPLYTO              0.586
 score HK_SCAM                        0.001
-score HOSTED_IMG_DIRECT_MX           2.144
+score HOSTED_IMG_DIRECT_MX           2.505
 score HOSTED_IMG_FREEM               3.496
 score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_OFF_PAGE                  2.320
-score HTML_SINGLET_MANY              1.929
-score HTML_TEXT_INVISIBLE_FONT       0.001
-score HTML_TEXT_INVISIBLE_STYLE      2.095
+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 JH_SPAMMY_HEADERS              3.496
-score KHOP_FAKE_EBAY                 0.948
-score KHOP_HELO_FCRDNS               0.399
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.447
-score LONG_HEX_URI                   0.950
-score LONG_IMG_URI                   0.938
-score LONG_INVISIBLE_TEXT            0.172
+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 LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    1.498
-score MALWARE_NORDNS                 0.368
+score MALWARE_NORDNS                 0.443
 score MANY_SPAN_IN_TEXT              2.297
 score MILLION_HUNDRED                2.896
 score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           0.317
-score MIXED_AREA_CASE                1.544
-score MIXED_CENTER_CASE              1.174
-score MIXED_ES                       2.626
-score MIXED_FONT_CASE                2.101
-score MIXED_HREF_CASE                1.443
-score MIXED_IMG_CASE                 0.346
+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 MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001
+score MONEY_FORM                     0.001 # force non-zero
 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.212
+score MONEY_FREEMAIL_REPTO           1.216
 score MONEY_FROM_41                  1.997
-score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.119
-score MSGID_WSP_TRAIL                1.040
-score MSMAIL_PRI_ABNORMAL            1.126
-score NAME_EMAIL_DIFF                2.436
-score NA_DOLLARS                     0.384
+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 NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.430
+score NICE_REPLY_A                   -0.277
 score NOT_SPAM                       2.996
-score NO_FM_NAME_IP_HOSTN            0.490
+score NO_FM_NAME_IP_HOSTN            0.486
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.705
-score ODD_FREEM_REPTO                2.562
+score NUMBEREND_LINKBAIT             0.346
+score ODD_FREEM_REPTO                2.722
 score ONLINE_MKTG_CNSLT              2.297
-score ORDER_TODAY                    0.365
+score ORDER_TODAY                    0.405
 score PDS_BTC_ID                     0.498
 score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   1.371
+score PDS_BTC_NTLD                   0.224
 score PDS_FRNOM_TODOM_DBL_URL        1.498
 score PDS_FRNOM_TODOM_NAKED_TO       1.498
 score PDS_FROM_2_EMAILS_SHRTNER      1.498
-score PDS_FROM_NAME_TO_DOMAIN        1.998
+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.032
-score PDS_TINYSUBJ_URISHRT           1.498
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
-score PDS_TO_EQ_FROM_NAME            3.099
-score PHP_ORIG_SCRIPT                0.584
+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 PHP_ORIG_SCRIPT_EVAL           2.996
-score PHP_SCRIPT                     2.158
+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.663
-score RCVD_IN_MSPIKE_H2              -0.001
-score RDNS_NUM_TLD_XM                0.583
+score RATWARE_NO_RDNS                2.354
+score RCVD_IN_MSPIKE_H2              -0.001 # force non-zero
+score RDNS_NUM_TLD_XM                1.994
 score READY_TO_SHIP                  1.248
-score REPTO_419_FRAUD                2.827
-score REPTO_419_FRAUD_GM             2.519
+score REPTO_419_FRAUD                2.999
+score REPTO_419_FRAUD_GM             2.851
 score REPTO_419_FRAUD_GM_LOOSE       0.998
 score RISK_FREE                      2.896
-score SCC_NEWBIE_HASBEENS            1.254
-score SENDGRID_REDIR                 1.097
-score SERGIO_SUBJECT_VIAGRA01        4.095
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_IMG            2.170
-score SHORT_SHORTNER                 0.718
-score SINGLETS_LOW_CONTRAST          1.963
-score SPOOFED_FREEMAIL               1.224
+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 SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            0.001
-score SPOOFED_FREEM_REPTO_CHN        1.033
+score SPOOFED_FREEM_REPTO_CHN        3.379
 score SPOOF_GMAIL_MID                1.498
 score STATIC_XPRIO_OLE               1.997
 score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
-score THIS_AD                        0.898
+score THIS_AD                        0.998
 score TO_EQ_FM_DIRECT_MX             2.497
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
+score TO_EQ_FM_HTML_ONLY             2.297
 score TO_EQ_FM_SPF_FAIL              0.001
 score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.254
+score TO_NAME_SUBJ_NO_RDNS           2.637
 score TO_NO_BRKTS_FROM_MSSP          0.001
-score TO_NO_BRKTS_HTML_IMG           0.001
+score TO_NO_BRKTS_HTML_IMG           0.071
 score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_MSFT               0.001
-score TO_NO_BRKTS_NORDNS_HTML        1.224
+score TO_NO_BRKTS_NORDNS_HTML        1.204
 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.982
-score TVD_SPACE_RATIO_MINFP          0.001
+score TVD_RCVD_SPACE_BRACKET         1.767
+score TVD_SPACE_ENCODED              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.430
-score URI_DQ_UNSUB                   2.219
+score URI_DOTEDU                     1.837
+score URI_DQ_UNSUB                   1.821
 score URI_FIREBASEAPP                2.996
 score URI_GOOGLE_PROXY               2.596
 score URI_GOOG_STO_SPAMMY            2.996
-score URI_LONG_REPEAT                2.499
+score URI_LONG_REPEAT                2.422
 score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      3.309
-score URI_PHP_REDIR                  3.497
+score URI_PHISH                      3.310
+score URI_PHP_REDIR                  3.496
 score URI_TRY_3LD                    1.997
 score URI_WPADMIN                    2.397
-score URI_WP_HACKED                  0.115
+score URI_WP_HACKED                  0.001
 score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                2.046
-score WALMART_IMG_NOT_RCVD_WAL       1.369
-score WANT_TO_ORDER                  2.035
+score VFY_ACCT_NORDNS                2.061
+score WALMART_IMG_NOT_RCVD_WAL       1.682
+score WANT_TO_ORDER                  2.426
 score WORD_INVIS_MANY                2.996
 score XFER_LOTSA_MONEY               0.998
 score XM_DIGITS_ONLY                 0.001
-score XM_RANDOM                      0.926
+score XM_RANDOM                      0.936
 score XM_RECPTID                     2.996
 score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          0.298
-score YOU_INHERIT                    2.398
+score YOUR_DELIVERY_ADDRESS          0.308
+score YOU_INHERIT                    2.127
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -288,6 +289,7 @@
 score BULK_RE_SUSP_NTLD              1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
+score COMPENSATION                   1.000
 score DAY_I_EARNED                   1.000
 score DKIMWL_BLOCKED                 0.001
 score DOTGOV_IMAGE                   1.000
@@ -295,7 +297,6 @@
 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
@@ -346,7 +347,6 @@
 score OFFER_ONLY_AMERICA             1.000
 score PDS_DBL_URL_TNB_RUNON          1.000
 score PDS_HELO_SPF_FAIL              1.000
-score PDS_SHORTFWD_URISHRT_QP        1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHISH_FBASEAPP                 1.000
 score PHOTO_EDITING_DIRECT           1.000
@@ -374,7 +374,6 @@
 score REPTO_419_FRAUD_YN             1.000
 score SENDGRID_REDIR_PHISH           1.000
 score SEO_SUSP_NTLD                  1.000
-score SHORT_BODY_G_DRIVE_DYN         1.000
 score SHORT_IMG_SUSP_NTLD            1.000
 score SPOOFED_FREEM_REPTO_RUS        1.000
 score STOCK_LOW_CONTRAST             1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 1efa794..d8987ee 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: 240187  36.838%  (99.727% of non-spam corpus)
-# Correctly spam:     313542  48.089%  (76.258% of spam corpus)
-# False positives:       657  0.101%  (0.273% of nonspam,  36895 weighted)
-# False negatives:     97620  14.972%  (23.742% of spam, 158837 weighted)
+# 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)
 # Average score for spam:  11.2    nonspam: 0.6
-# Average for false-pos:   6.6  false-neg: 1.6
-# TOTAL:              652006  100.00%
+# Average for false-pos:   6.4  false-neg: 1.6
+# TOTAL:              625471  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  30063  99.76%
-# Correctly spam:      39310  76.68%
-# False positives:        71  0.24%
-# False negatives:     11953  23.32%
-# TCR(l=50): 3.306650  SpamRecall: 76.683%  SpamPrec: 99.820%
+# 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%
 
 ##### 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: 230716  95.79%
-# Correctly spam:     225477  54.84%
-# False positives:     10128  4.21%
-# False negatives:    185685  45.16%
-# TCR(l=50): 0.594092  SpamRecall: 54.839%  SpamPrec: 95.701%
+# 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%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  28836  95.69%
-# Correctly spam:      28049  54.72%
-# False positives:      1298  4.31%
-# False negatives:     23214  45.28%
-# TCR(l=50): 0.581780  SpamRecall: 54.716%  SpamPrec: 95.577%
+# 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%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 40a11d8..8309547 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: 236649  37.404%  (99.588% of non-spam corpus)
-# Correctly spam:     353230  55.830%  (89.411% of spam corpus)
-# False positives:       980  0.155%  (0.412% of nonspam, 116173 weighted)
-# False negatives:     41833  6.612%  (10.589% of spam,  78884 weighted)
-# Average score for spam:  17.3    nonspam: -0.7
-# Average for false-pos:   7.1  false-neg: 1.9
-# TOTAL:              632692  100.00%
+# 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
+# Average for false-pos:   7.2  false-neg: 1.9
+# TOTAL:              632688  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:      44147  89.57%
+# Correctly spam:      44095  89.46%
 # False positives:       121  0.41%
-# False negatives:      5142  10.43%
-# TCR(l=50): 4.403949  SpamRecall: 89.568%  SpamPrec: 99.727%
+# False negatives:      5193  10.54%
+# TCR(l=50): 4.383883  SpamRecall: 89.464%  SpamPrec: 99.726%
 
 ##### 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:     274318  69.44%
+# Correctly spam:     274453  69.47%
 # False positives:       754  0.32%
-# False negatives:    120745  30.56%
-# TCR(l=50): 2.493376  SpamRecall: 69.437%  SpamPrec: 99.726%
+# False negatives:    120606  30.53%
+# TCR(l=50): 2.495540  SpamRecall: 69.471%  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:      34336  69.66%
+# Correctly spam:      34121  69.23%
 # False positives:        93  0.31%
-# False negatives:     14953  30.34%
-# TCR(l=50): 2.514360  SpamRecall: 69.663%  SpamPrec: 99.730%
+# False negatives:     15167  30.77%
+# TCR(l=50): 2.487157  SpamRecall: 69.228%  SpamPrec: 99.728%