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

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1891881 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index 48b4e8c..37bdd64 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.999 2.999 2.999
 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.897 1.997 1.897 1.997
+score AC_FROM_MANY_DOTS                     2.999 2.999 2.999 2.999
+score AC_HTML_NONSENSE_TAGS                 1.896 1.999 1.896 1.999
 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,289 +13,287 @@
 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.399 3.599 3.399
 score ADULT_DATING_COMPANY                  10.001 10.001 10.001 10.001
-score ADVANCE_FEE_2_NEW_FORM                0.001 0.471 0.001 0.471
-score ADVANCE_FEE_2_NEW_FRM_MNY             2.497 2.497 2.497 2.497
-score ADVANCE_FEE_2_NEW_MONEY               1.997 0.001 1.997 0.001
-score ADVANCE_FEE_3_NEW                     3.066 3.407 3.066 3.407
-score ADVANCE_FEE_3_NEW_FRM_MNY             1.811 0.001 1.811 0.001
-score ADVANCE_FEE_3_NEW_MONEY               2.083 0.982 2.083 0.982
-score ADVANCE_FEE_4_NEW                     2.696 2.397 2.696 2.397
-score ADVANCE_FEE_4_NEW_FRM_MNY             2.464 0.001 2.464 0.001
-score ADVANCE_FEE_4_NEW_MONEY               0.488 0.001 0.488 0.001
-score ADVANCE_FEE_5_NEW                     2.796 2.497 2.796 2.497
-score ADVANCE_FEE_5_NEW_FRM_MNY             1.578 0.001 1.578 0.001
+score ADVANCE_FEE_2_NEW_FORM                0.326 1.596 0.326 1.596
+score ADVANCE_FEE_2_NEW_FRM_MNY             2.499 2.499 2.499 2.499
+score ADVANCE_FEE_2_NEW_MONEY               1.999 0.001 1.999 0.001
+score ADVANCE_FEE_3_NEW                     2.965 3.404 2.965 3.404
+score ADVANCE_FEE_3_NEW_FRM_MNY             2.335 0.001 2.335 0.001
+score ADVANCE_FEE_3_NEW_MONEY               2.060 1.001 2.060 1.001
+score ADVANCE_FEE_4_NEW                     2.699 2.399 2.699 2.399
+score ADVANCE_FEE_4_NEW_FRM_MNY             2.220 0.001 2.220 0.001
+score ADVANCE_FEE_4_NEW_MONEY               0.489 0.001 0.489 0.001
+score ADVANCE_FEE_5_NEW                     2.699 2.499 2.699 2.499
+score ADVANCE_FEE_5_NEW_FRM_MNY             0.661 0.001 0.661 0.001
 score ADVANCE_FEE_5_NEW_MONEY               0.001 0.001 0.001 0.001
-score AD_PREFS                              0.095 0.498 0.095 0.498
-score ALIBABA_IMG_NOT_RCVD_ALI              2.497 0.163 2.497 0.163
-score AMAZON_IMG_NOT_RCVD_AMZN              1.645 0.001 1.645 0.001
+score AD_PREFS                              0.499 0.500 0.499 0.500
+score ALIBABA_IMG_NOT_RCVD_ALI              2.499 1.461 2.499 1.461
+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.205 1.997 0.205
+score APP_DEVELOPMENT_NORDNS                1.999 0.332 1.999 0.332
 score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5          1.812 0.001 1.812 0.001
-score BEBEE_IMG_NOT_RCVD_BB                 1.656 0.001 1.656 0.001
-score BIGNUM_EMAILS_FREEM                   2.996 2.033 2.996 2.033
-score BIGNUM_EMAILS_MANY                    2.996 1.000 2.996 1.000
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          1.305 1.372 1.305 1.372
+score BEBEE_IMG_NOT_RCVD_BB                 0.001 0.001 0.001 0.001
+score BIGNUM_EMAILS_FREEM                   2.999 1.633 2.999 1.633
+score BIGNUM_EMAILS_MANY                    2.999 1.000 2.999 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.497 3.496 3.497 3.496
+score BITCOIN_MALF_HTML                     3.499 3.499 3.499 3.499
 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                          3.000 2.999 3.000 2.999
 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                       1.857 1.326 1.857 1.326
-score BITCOIN_SPAM_03                       2.497 1.532 2.497 1.532
+score BITCOIN_SPAM_02                       1.859 1.185 1.859 1.185
+score BITCOIN_SPAM_03                       2.499 2.250 2.499 2.250
 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_05                       0.001 2.499 0.001 2.499
 score BITCOIN_SPAM_06                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07                       3.497 3.089 3.497 3.089
+score BITCOIN_SPAM_07                       3.499 3.255 3.499 3.255
 score BITCOIN_SPAM_08                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_09                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_10                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_11                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_12                       1.000 1.000 1.000 1.000
 score BITCOIN_SPF_ONLYALL                   0.001 1.000 0.001 1.000
-score BITCOIN_XPRIO                         0.001 0.149 0.001 0.149
-score BITCOIN_YOUR_INFO                     2.996 2.308 2.996 2.308
+score BITCOIN_XPRIO                         0.001 0.176 0.001 0.176
+score BITCOIN_YOUR_INFO                     1.500 2.314 1.500 2.314
 score BODY_URI_ONLY                         1.000 0.001 1.000 0.001
-score BOGUS_MIME_VERSION                    3.496 3.278 3.496 3.278
-score BOGUS_MSM_HDRS                        1.300 1.000 1.300 1.000
+score BOGUS_MIME_VERSION                    3.500 3.259 3.500 3.259
+score BOGUS_MSM_HDRS                        1.718 1.000 1.718 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.008 0.249 0.008
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
-score COMPENSATION                          1.000 1.000 1.000 1.000
-score CONTENT_AFTER_HTML                    2.497 2.418 2.497 2.418
-score CTE_8BIT_MISMATCH                     0.998 0.001 0.998 0.001
+score CONTENT_AFTER_HTML                    2.500 2.417 2.500 2.417
+score CTE_8BIT_MISMATCH                     1.000 0.001 1.000 0.001
 score DAY_I_EARNED                          1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY                      3.096 2.896 3.096 2.896
-score DETAILS_OF_PRODUCT                    1.248 1.248 1.248 1.248
-score DKIMWL_BL                             0.001 2.334 0.001 2.334
+score DEAR_BENEFICIARY                      3.099 2.799 3.099 2.799
+score DETAILS_OF_PRODUCT                    1.249 1.249 1.249 1.249
+score DKIMWL_BL                             0.001 2.320 0.001 2.320
 score DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH                        0.001 -0.717 0.001 -0.717
+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.275 0.001 -0.275
+score DKIMWL_WL_MEDHI                       0.001 -0.912 0.001 -0.912
 score DOTGOV_IMAGE                          1.000 1.000 1.000 1.000
-score DX_TEXT_03                            0.899 0.698 0.899 0.698
-score DYNAMIC_IMGUR                         1.000 2.851 1.000 2.851
-score EBAY_IMG_NOT_RCVD_EBAY                0.882 1.666 0.882 1.666
-score ENCRYPTED_MESSAGE                     -0.898 -0.998 -0.898 -0.998
+score DX_TEXT_03                            0.899 0.700 0.899 0.700
+score DYNAMIC_IMGUR                         1.000 1.922 1.000 1.922
+score EBAY_IMG_NOT_RCVD_EBAY                2.276 0.135 2.276 0.135
+score ENCRYPTED_MESSAGE                     -0.898 -1.000 -0.898 -1.000
 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.995 2.642 3.995 2.642
-score FAKE_REPLY_B                          3.895 3.695 3.895 3.695
+score FACEBOOK_IMG_NOT_RCVD_FB              1.999 1.999 1.999 1.999
+score FAKE_REPLY_A1                         3.999 3.660 3.999 3.660
+score FAKE_REPLY_B                          3.899 3.699 3.899 3.699
 score FBI_MONEY                             1.000 1.000 1.000 1.000
 score FBI_SPOOF                             1.000 1.000 1.000 1.000
-score FILL_THIS_FORM                        1.198 0.001 1.198 0.001
+score FILL_THIS_FORM                        1.200 0.001 1.200 0.001
 score FONT_INVIS_DIRECT                     2.395 0.001 2.395 0.001
-score FONT_INVIS_DOTGOV                     3.497 3.496 3.497 3.496
-score FONT_INVIS_HTML_NOHTML                2.996 2.996 2.996 2.996
-score FONT_INVIS_LONG_LINE                  2.996 1.000 2.996 1.000
-score FONT_INVIS_MSGID                      2.497 1.842 2.497 1.842
-score FONT_INVIS_NORDNS                     2.123 1.749 2.123 1.749
+score FONT_INVIS_DOTGOV                     3.499 3.500 3.499 3.500
+score FONT_INVIS_HTML_NOHTML                2.999 2.999 2.999 2.999
+score FONT_INVIS_LONG_LINE                  2.999 1.000 2.999 1.000
+score FONT_INVIS_MSGID                      2.499 1.849 2.499 1.849
+score FONT_INVIS_NORDNS                     2.331 2.242 2.331 2.242
 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 1.913 3.246 1.913
-score FREEMAIL_FORGED_FROMDOMAIN            0.249 0.249 0.249 0.249
+score FOUND_YOU                             3.249 1.349 3.249 1.349
+score FREEMAIL_FORGED_FROMDOMAIN            0.250 0.250 0.250 0.250
 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.096 2.595 3.096 2.595
-score FROM_2_EMAILS_SHORT                   2.568 2.996 2.568 2.996
+score FROMSPACE                             3.099 2.418 3.099 2.418
+score FROM_2_EMAILS_SHORT                   2.549 2.999 2.549 2.999
 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_BANK_NOAUTH                      0.001 0.999 0.001 0.999
 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.752 0.001 -0.752
+score FROM_FMBLA_NEWDOM                     0.001 1.499 0.001 1.499
+score FROM_FMBLA_NEWDOM14                   0.001 0.999 0.001 0.999
+score FROM_FMBLA_NEWDOM28                   0.001 0.799 0.001 0.799
+score FROM_GOV_DKIM_AU                      0.001 -0.740 0.001 -0.740
 score FROM_GOV_REPLYTO_FREEMAIL             0.001 1.000 0.001 1.000
 score FROM_GOV_SPOOF                        0.001 0.001 0.001 0.001
-score FROM_IN_TO_AND_SUBJ                   2.498 0.001 2.498 0.001
-score FROM_MISSPACED                        1.891 0.001 1.891 0.001
-score FROM_MISSP_DYNIP                      0.001 2.197 0.001 2.197
+score FROM_IN_TO_AND_SUBJ                   1.578 0.001 1.578 0.001
+score FROM_MISSPACED                        0.643 0.001 0.643 0.001
+score FROM_MISSP_DYNIP                      0.001 2.199 0.001 2.199
 score FROM_MISSP_EH_MATCH                   0.001 0.001 0.001 0.001
-score FROM_MISSP_FREEMAIL                   2.500 0.001 2.500 0.001
+score FROM_MISSP_FREEMAIL                   2.904 0.001 2.904 0.001
 score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
-score FROM_MISSP_PHISH                      3.496 3.496 3.496 3.496
+score FROM_MISSP_PHISH                      3.499 3.499 3.499 3.499
 score FROM_MISSP_REPLYTO                    1.000 0.001 1.000 0.001
 score FROM_MISSP_SPF_FAIL                   0.001 0.001 0.001 0.001
 score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
-score FROM_MULTI_NORDNS                     0.353 2.346 0.353 2.346
-score FROM_NAME_EQ_TO_G_DRIVE               0.402 0.001 0.402 0.001
+score FROM_MULTI_NORDNS                     0.362 0.509 0.362 0.509
+score FROM_NAME_EQ_TO_G_DRIVE               1.499 1.355 1.499 1.355
 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.579 1.121 1.579 1.121
+score FROM_NTLD_REPLY_FREEMAIL              1.999 0.660 1.999 0.660
 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.498 0.499 0.498 0.499
-score FROM_SUSPICIOUS_NTLD_FP               1.998 1.099 1.998 1.099
-score FSL_BULK_SIG                          0.001 2.617 0.001 2.617
+score FROM_SUSPICIOUS_NTLD                  0.499 0.499 0.499 0.499
+score FROM_SUSPICIOUS_NTLD_FP               1.999 1.026 1.999 1.026
+score FSL_BULK_SIG                          0.001 2.622 0.001 2.622
 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.899 3.100 2.899
 score FSL_NEW_HELO_USER                     0.001 0.001 0.001 0.001
-score FUZZY_AMAZON                          2.497 2.197 2.497 2.197
+score FUZZY_AMAZON                          2.399 2.199 2.399 2.199
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
-score GB_FAKE_RF_SHORT                      1.000 1.997 1.000 1.997
+score GB_FAKE_RF_SHORT                      1.000 1.999 1.000 1.999
 score GB_FORGED_MUA_POSTFIX                 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO                    0.499 0.498 0.499 0.498
-score GB_FREEMAIL_DISPTO_NOTFREEM           0.498 0.498 0.498 0.498
+score GB_FREEMAIL_DISPTO                    0.499 0.499 0.499 0.499
+score GB_FREEMAIL_DISPTO_NOTFREEM           0.499 0.500 0.499 0.500
 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.495 2.996 2.495 2.996
+score GOOGLE_DOC_SUSP                       2.498 2.999 2.498 2.999
 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                     3.399 2.996 3.399 2.996
-score GOOG_STO_EMAIL_PHISH                  2.293 2.563 2.293 2.563
-score GOOG_STO_HTML_PHISH                   2.061 2.424 2.061 2.424
-score GOOG_STO_HTML_PHISH_MANY              3.216 1.648 3.216 1.648
-score GOOG_STO_IMG_HTML                     2.996 2.996 2.996 2.996
+score GOOG_REDIR_NORDNS                     2.914 2.999 2.914 2.999
+score GOOG_STO_EMAIL_PHISH                  2.867 2.473 2.867 2.473
+score GOOG_STO_HTML_PHISH                   2.711 2.112 2.711 2.112
+score GOOG_STO_HTML_PHISH_MANY              3.595 2.856 3.595 2.856
+score GOOG_STO_IMG_HTML                     2.999 2.999 2.999 2.999
 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.999 2.999 2.999
 score HAS_X_NO_RELAY                        1.000 1.000 1.000 1.000
-score HAS_X_OUTGOING_SPAM_STAT              1.997 1.025 1.997 1.025
-score HDRS_LCASE                            0.100 0.098 0.100 0.098
-score HDRS_LCASE_IMGONLY                    0.098 0.001 0.098 0.001
-score HDRS_MISSP                            1.693 0.001 1.693 0.001
-score HDR_ORDER_FTSDMCXX_DIRECT             1.348 0.001 1.348 0.001
+score HAS_X_OUTGOING_SPAM_STAT              1.999 0.964 1.999 0.964
+score HDRS_LCASE_IMGONLY                    0.099 0.021 0.099 0.021
+score HDRS_MISSP                            2.166 0.001 2.166 0.001
+score HDR_ORDER_FTSDMCXX_DIRECT             0.856 0.001 0.856 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.250 0.250 0.250
 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.749 1.498 0.749
-score HK_NAME_MR_MRS                        0.998 0.218 0.998 0.218
-score HK_RANDOM_ENVFROM                     0.998 0.998 0.998 0.998
-score HK_RANDOM_FROM                        0.998 0.998 0.998 0.998
-score HK_RANDOM_REPLYTO                     0.998 0.395 0.998 0.395
+score HK_NAME_FM_MR_MRS                     1.500 0.795 1.500 0.795
+score HK_NAME_MR_MRS                        0.999 0.105 0.999 0.105
+score HK_RANDOM_ENVFROM                     0.999 0.999 0.999 0.999
+score HK_RANDOM_FROM                        0.999 0.982 0.999 0.982
+score HK_RANDOM_REPLYTO                     0.999 0.999 0.999 0.999
 score HK_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
-score HK_SCAM                               0.483 0.001 0.483 0.001
+score HK_SCAM                               0.584 0.001 0.584 0.001
 score HK_WIN                                1.000 1.000 1.000 1.000
-score HOSTED_IMG_DIRECT_MX                  1.768 1.988 1.768 1.988
+score HOSTED_IMG_DIRECT_MX                  2.395 3.224 2.395 3.224
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM                      3.497 3.496 3.497 3.496
-score HOSTED_IMG_MULTI                      1.092 1.000 1.092 1.000
-score HOSTED_IMG_MULTI_PUB_01               2.997 2.996 2.997 2.996
+score HOSTED_IMG_FREEM                      3.500 3.499 3.500 3.499
+score HOSTED_IMG_MULTI                      1.427 1.000 1.427 1.000
+score HOSTED_IMG_MULTI_PUB_01               2.999 2.999 2.999 2.999
 score HTML_ENTITY_ASCII                     2.999 1.000 2.999 1.000
 score HTML_ENTITY_ASCII_TINY                1.000 1.000 1.000 1.000
-score HTML_OFF_PAGE                         2.996 2.663 2.996 2.663
+score HTML_OFF_PAGE                         2.999 2.016 2.999 2.016
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY                     1.000 0.998 1.000 0.998
-score HTML_TAG_BALANCE_CENTER               2.097 0.001 2.097 0.001
-score HTML_TEXT_INVISIBLE_FONT              1.000 0.146 1.000 0.146
-score HTML_TEXT_INVISIBLE_STYLE             2.083 2.084 2.083 2.084
-score IMG_ONLY_FM_DOM_INFO                  1.275 1.000 1.275 1.000
-score JH_SPAMMY_HEADERS                     3.496 3.496 3.496 3.496
+score HTML_SINGLET_MANY                     1.000 0.976 1.000 0.976
+score HTML_TAG_BALANCE_CENTER               1.866 0.001 1.866 0.001
+score HTML_TEXT_INVISIBLE_FONT              1.000 0.424 1.000 0.424
+score HTML_TEXT_INVISIBLE_STYLE             2.319 2.092 2.319 2.092
+score IMG_ONLY_FM_DOM_INFO                  1.268 1.000 1.268 1.000
+score JH_SPAMMY_HEADERS                     3.499 3.499 3.499 3.499
 score JH_SPAMMY_PATTERN01                   1.000 1.000 1.000 1.000
 score JH_SPAMMY_PATTERN02                   1.000 1.000 1.000 1.000
-score KHOP_HELO_FCRDNS                      0.400 0.398 0.400 0.398
-score LINKEDIN_IMG_NOT_RCVD_LNKN            2.497 2.499 2.497 2.499
+score KHOP_HELO_FCRDNS                      0.400 0.399 0.400 0.399
+score LINKEDIN_IMG_NOT_RCVD_LNKN            2.499 2.471 2.499 2.471
 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.996 0.948 2.996 0.948
-score LONG_IMG_URI                          0.890 0.943 0.890 0.943
-score LONG_INVISIBLE_TEXT                   1.735 0.171 1.735 0.171
+score LONG_HEX_URI                          2.999 0.944 2.999 0.944
+score LONG_IMG_URI                          0.883 0.935 0.883 0.935
+score LONG_INVISIBLE_TEXT                   1.780 0.161 1.780 0.161
 score LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
-score LOTTO_AGENT                           0.986 1.498 0.986 1.498
-score LOTTO_DEPT                            1.997 0.001 1.997 0.001
+score LOTTO_AGENT                           1.336 1.499 1.336 1.499
+score LOTTO_DEPT                            1.999 0.001 1.999 0.001
 score LUCRATIVE                             1.000 1.000 1.000 1.000
 score MALF_HTML_B64                         1.000 1.000 1.000 1.000
-score MALWARE_NORDNS                        2.103 0.352 2.103 0.352
+score MALWARE_NORDNS                        2.103 0.510 2.103 0.510
 score MALWARE_PASSWORD                      1.000 1.000 1.000 1.000
 score MANY_HDRS_LCASE                       0.100 0.100 0.100 0.100
-score MANY_SPAN_IN_TEXT                     2.397 2.297 2.397 2.297
-score MILLION_HUNDRED                       3.196 2.896 3.196 2.896
-score MILLION_USD                           0.216 0.001 0.216 0.001
-score MIMEOLE_DIRECT_TO_MX                  0.553 0.320 0.553 0.320
+score MANY_SPAN_IN_TEXT                     2.400 2.299 2.400 2.299
+score MILLION_HUNDRED                       3.099 2.899 3.099 2.899
+score MILLION_USD                           0.123 0.001 0.123 0.001
+score MIMEOLE_DIRECT_TO_MX                  1.042 0.165 1.042 0.165
 score MIME_NO_TEXT                          1.000 1.000 1.000 1.000
-score MIXED_AREA_CASE                       1.547 0.641 1.547 0.641
-score MIXED_CENTER_CASE                     1.630 2.164 1.630 2.164
-score MIXED_ES                              2.997 2.598 2.997 2.598
-score MIXED_FONT_CASE                       1.342 1.594 1.342 1.594
-score MIXED_HREF_CASE                       1.896 0.606 1.896 0.606
-score MIXED_IMG_CASE                        2.570 1.623 2.570 1.623
+score MIXED_AREA_CASE                       2.149 1.214 2.149 1.214
+score MIXED_CENTER_CASE                     2.433 1.591 2.433 1.591
+score MIXED_ES                              3.000 2.600 3.000 2.600
+score MIXED_FONT_CASE                       1.709 0.288 1.709 0.288
+score MIXED_HREF_CASE                       1.999 0.456 1.999 0.456
+score MIXED_IMG_CASE                        1.124 1.980 1.124 1.980
 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                        1.911 0.001 1.911 0.001
+score MONEY_ATM_CARD                        1.958 0.001 1.958 0.001
 score MONEY_FORM                            0.001 0.001 0.001 0.001
-score MONEY_FORM_SHORT                      1.239 0.001 1.239 0.001
+score MONEY_FORM_SHORT                      1.338 0.001 1.338 0.001
 score MONEY_FRAUD_3                         0.001 0.001 0.001 0.001
-score MONEY_FRAUD_5                         0.657 0.001 0.657 0.001
-score MONEY_FRAUD_8                         0.785 0.001 0.785 0.001
-score MONEY_FREEMAIL_REPTO                  2.996 1.329 2.996 1.329
-score MONEY_FROM_41                         1.997 1.997 1.997 1.997
+score MONEY_FRAUD_5                         0.001 0.001 0.001 0.001
+score MONEY_FRAUD_8                         1.155 0.001 1.155 0.001
+score MONEY_FREEMAIL_REPTO                  2.999 1.213 2.999 1.213
+score MONEY_FROM_41                         1.999 1.999 1.999 1.999
 score MONEY_FROM_MISSP                      0.001 0.001 0.001 0.001
-score MONEY_NOHTML                          1.671 0.948 1.671 0.948
+score MONEY_NOHTML                          1.913 1.169 1.913 1.169
 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.062 0.675 1.062 0.675
-score MSMAIL_PRI_ABNORMAL                   0.314 1.179 0.314 1.179
+score MSGID_WSP_TRAIL                       1.915 0.555 1.915 0.555
+score MSMAIL_PRI_ABNORMAL                   1.499 0.517 1.499 0.517
 score MSM_PRIO_REPTO                        1.000 1.000 1.000 1.000
-score NAME_EMAIL_DIFF                       1.917 2.441 1.917 2.441
-score NA_DOLLARS                            0.829 0.538 0.829 0.538
+score NAME_EMAIL_DIFF                       1.939 2.445 1.939 2.445
+score NA_DOLLARS                            0.215 0.174 0.215 0.174
 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.246 -0.125 -0.246 -0.125
-score NOT_SPAM                              3.296 3.096 3.296 3.096
-score NO_FM_NAME_IP_HOSTN                   0.288 0.491 0.288 0.491
+score NEW_PRODUCTS                          1.249 1.249 1.249 1.249
+score NICE_REPLY_A                          -1.156 -0.202 -1.156 -0.202
+score NOT_SPAM                              3.199 2.999 3.199 2.999
+score NO_FM_NAME_IP_HOSTN                   0.282 0.492 0.282 0.492
 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.999 0.575 0.999 0.575
+score NUMBEREND_LINKBAIT                    0.595 0.555 0.595 0.555
 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.448 2.996 2.448
-score OFFER_ONLY_AMERICA                    1.650 1.000 1.650 1.000
-score ONLINE_MKTG_CNSLT                     2.596 2.397 2.596 2.397
-score ORDER_TODAY                           1.569 1.240 1.569 1.240
-score PDS_BTC_ID                            0.498 0.498 0.498 0.498
+score ODD_FREEM_REPTO                       3.000 2.797 3.000 2.797
+score OFFER_ONLY_AMERICA                    1.430 1.000 1.430 1.000
+score ONLINE_MKTG_CNSLT                     2.600 2.399 2.600 2.399
+score ORDER_TODAY                           0.204 0.767 0.204 0.767
+score PDS_BTC_ID                            0.500 0.499 0.500 0.499
 score PDS_BTC_MSGID                         0.001 0.001 0.001 0.001
-score PDS_BTC_NTLD                          1.923 1.220 1.923 1.220
-score PDS_DBL_URL_TNB_RUNON                 1.997 1.000 1.997 1.000
-score PDS_FRNOM_TODOM_DBL_URL               1.499 1.498 1.499 1.498
-score PDS_FRNOM_TODOM_NAKED_TO              1.498 1.498 1.498 1.498
-score PDS_FROM_2_EMAILS_SHRTNER             1.013 1.498 1.013 1.498
-score PDS_FROM_NAME_TO_DOMAIN               1.997 1.997 1.997 1.997
+score PDS_BTC_NTLD                          1.825 1.028 1.825 1.028
+score PDS_DBL_URL_TNB_RUNON                 1.999 1.000 1.999 1.000
+score PDS_FRNOM_TODOM_DBL_URL               1.499 1.499 1.499 1.499
+score PDS_FRNOM_TODOM_NAKED_TO              1.499 1.499 1.499 1.499
+score PDS_FROM_2_EMAILS_SHRTNER             1.401 1.499 1.401 1.499
+score PDS_FROM_NAME_TO_DOMAIN               1.999 1.999 1.999 1.999
 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.999 0.999 0.999
+score PDS_OTHER_BAD_TLD                     1.999 1.999 1.999 1.999
+score PDS_PHP_EVAL                          1.499 1.499 1.499 1.499
 score PDS_RDNS_DYNAMIC_FP                   0.001 0.001 0.001 0.001
-score PDS_SHORTFWD_URISHRT_FP               1.498 1.216 1.498 1.216
-score PDS_TINYSUBJ_URISHRT                  1.499 1.498 1.499 1.498
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.997 1.594 1.997 1.594
-score PDS_TO_EQ_FROM_NAME                   3.196 2.590 3.196 2.590
+score PDS_SHORTFWD_URISHRT_FP               1.499 1.334 1.499 1.334
+score PDS_TINYSUBJ_URISHRT                  1.499 1.499 1.499 1.499
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.999 1.596 1.999 1.596
+score PDS_TO_EQ_FROM_NAME                   3.200 3.099 3.200 3.099
 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.249 0.585 2.249 0.585
-score PHP_ORIG_SCRIPT_EVAL                  2.996 2.996 2.996 2.996
-score PHP_SCRIPT                            2.497 2.265 2.497 2.265
+score PHP_ORIG_SCRIPT                       2.251 0.590 2.251 0.590
+score PHP_ORIG_SCRIPT_EVAL                  3.000 3.000 3.000 3.000
+score PHP_SCRIPT                            2.499 2.332 2.499 2.332
 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 1.000 0.999 1.000
 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 3.000 2.999 3.000
 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                       1.892 1.647 1.892 1.647
+score RAND_MKTG_HEADER                      1.999 1.999 1.999 1.999
+score RATWARE_NO_RDNS                       0.649 2.124 0.649 2.124
 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
@@ -310,15 +308,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                       1.628 1.887 1.628 1.887
-score READY_TO_SHIP                         1.248 1.248 1.248 1.248
-score REPLYTO_EMPTY                         2.397 0.001 2.397 0.001
-score REPTO_419_FRAUD                       2.938 2.999 2.938 2.999
+score RDNS_NUM_TLD_XM                       0.322 0.468 0.322 0.468
+score READY_TO_SHIP                         1.249 1.249 1.249 1.249
+score REPLYTO_EMPTY                         2.399 0.001 2.399 0.001
+score REPTO_419_FRAUD                       1.936 2.760 1.936 2.760
 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.715 2.996 2.715
-score REPTO_419_FRAUD_GM_LOOSE              0.998 0.998 0.998 0.998
+score REPTO_419_FRAUD_GM                    2.999 2.999 2.999 2.999
+score REPTO_419_FRAUD_GM_LOOSE              0.999 0.999 0.999 0.999
 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
@@ -327,93 +325,92 @@
 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.717 1.044 1.717 1.044
-score SENDGRID_REDIR                        1.498 1.098 1.498 1.098
+score RISK_FREE                             3.099 2.899 3.099 2.899
+score SCC_NEWBIE_HASBEENS                   1.799 0.916 1.799 0.916
+score SENDGRID_REDIR                        1.499 1.355 1.499 1.355
 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               3.095 4.095 3.095 4.095
-score SHOPIFY_IMG_NOT_RCVD_SFY              2.497 2.497 2.497 2.497
-score SHORTENER_SHORT_IMG                   0.973 1.221 0.973 1.221
+score SEO_SUSP_NTLD                         1.199 1.000 1.199 1.000
+score SERGIO_SUBJECT_VIAGRA01               3.932 4.099 3.932 4.099
+score SHOPIFY_IMG_NOT_RCVD_SFY              2.499 2.499 2.499 2.499
+score SHORTENER_SHORT_IMG                   1.587 2.118 1.587 2.118
 score SHORT_IMG_SUSP_NTLD                   1.000 1.000 1.000 1.000
-score SHORT_SHORTNER                        1.997 0.676 1.997 0.676
-score SPOOFED_FREEMAIL                      0.001 1.224 0.001 1.224
+score SHORT_SHORTNER                        1.999 0.696 1.999 0.696
+score SPOOFED_FREEMAIL                      0.001 1.226 0.001 1.226
 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 0.646 0.001 0.646
+score SPOOFED_FREEM_REPTO_CHN               0.001 1.693 0.001 1.693
 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.552 1.997 1.552 1.997
+score SPOOF_GMAIL_MID                       1.000 1.499 1.000 1.499
+score STATIC_XPRIO_OLE                      1.073 1.999 1.073 1.999
 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 TARINGANET_IMG_NOT_RCVD_TN            1.999 0.001 1.999 0.001
-score THIS_AD                               1.298 0.999 1.298 0.999
-score THIS_IS_ADV_SUSP_NTLD                 1.477 1.000 1.477 1.000
+score TAGSTAT_IMG_NOT_RCVD_TGST             1.999 1.999 1.999 1.999
+score TARINGANET_IMG_NOT_RCVD_TN            1.892 0.001 1.892 0.001
+score THIS_AD                               1.299 0.999 1.299 0.999
+score THIS_IS_ADV_SUSP_NTLD                 0.001 1.000 0.001 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_DIRECT_MX                    0.001 2.499 0.001 2.499
 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                  1.000 2.128 1.000 2.128
-score TO_NO_BRKTS_FROM_MSSP                 2.497 0.001 2.497 0.001
-score TO_NO_BRKTS_HTML_IMG                  1.997 0.078 1.997 0.078
-score TO_NO_BRKTS_HTML_ONLY                 1.997 1.997 1.997 1.997
+score TO_IN_SUBJ                            0.100 0.099 0.100 0.099
+score TO_NAME_SUBJ_NO_RDNS                  1.000 2.539 1.000 2.539
+score TO_NO_BRKTS_FROM_MSSP                 2.499 0.001 2.499 0.001
+score TO_NO_BRKTS_HTML_IMG                  1.999 0.051 1.999 0.051
+score TO_NO_BRKTS_HTML_ONLY                 1.999 1.999 1.999 1.999
 score TO_NO_BRKTS_MSFT                      1.000 0.001 1.000 0.001
-score TO_NO_BRKTS_NORDNS_HTML               1.997 1.205 1.997 1.205
-score TO_NO_BRKTS_PCNT                      2.498 2.497 2.498 2.497
-score TRANSFORM_LIFE                        2.497 2.497 2.497 2.497
-score TVD_PH_BODY_META                      3.096 2.796 3.096 2.796
-score TVD_RCVD_SPACE_BRACKET                2.797 1.087 2.797 1.087
-score TVD_SPACE_ENCODED                     1.000 0.001 1.000 0.001
+score TO_NO_BRKTS_NORDNS_HTML               1.999 1.205 1.999 1.205
+score TO_NO_BRKTS_PCNT                      2.499 2.499 2.499 2.499
+score TRANSFORM_LIFE                        2.499 2.499 2.499 2.499
+score TVD_PH_BODY_META                      2.999 2.799 2.999 2.799
+score TVD_RCVD_SPACE_BRACKET                2.799 1.836 2.799 1.836
 score TVD_SPACE_RATIO_MINFP                 1.000 0.001 1.000 0.001
 score TW_GIBBERISH_MANY                     1.000 1.000 1.000 1.000
 score UC_GIBBERISH_OBFU                     1.000 1.000 1.000 1.000
-score UNDISC_FREEM                          3.096 2.696 3.096 2.696
-score UNDISC_MONEY                          3.396 3.096 3.396 3.096
+score UNDISC_FREEM                          2.999 2.699 2.999 2.699
+score UNDISC_MONEY                          3.399 3.100 3.399 3.100
 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.395 4.195 4.395 4.195
-score URI_DOTEDU                            1.997 1.773 1.997 1.773
+score URI_DEOBFU_INSTR                      4.399 4.199 4.399 4.199
+score URI_DOTEDU                            1.999 1.955 1.999 1.955
 score URI_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
-score URI_DQ_UNSUB                          2.497 1.896 2.497 1.896
-score URI_FIREBASEAPP                       2.996 2.996 2.996 2.996
-score URI_GOOGLE_PROXY                      3.096 2.596 3.096 2.596
-score URI_GOOG_STO_SPAMMY                   2.996 2.996 2.996 2.996
+score URI_DQ_UNSUB                          2.500 2.059 2.500 2.059
+score URI_FIREBASEAPP                       2.999 2.999 2.999 2.999
+score URI_GOOGLE_PROXY                      3.099 2.599 3.099 2.599
+score URI_GOOG_STO_SPAMMY                   2.999 2.999 2.999 2.999
 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.351 2.497 2.351
+score URI_LONG_REPEAT                       2.499 2.400 2.499 2.400
 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.334 3.995 3.334
-score URI_PHP_REDIR                         3.496 3.496 3.496 3.496
-score URI_TRY_3LD                           1.937 1.997 1.937 1.997
+score URI_PHISH                             3.999 3.313 3.999 3.313
+score URI_PHP_REDIR                         3.499 3.499 3.499 3.499
+score URI_TRY_3LD                           1.933 1.999 1.933 1.999
 score URI_TRY_USME                          1.000 1.000 1.000 1.000
-score URI_WPADMIN                           2.596 2.397 2.596 2.397
+score URI_WPADMIN                           2.599 2.399 2.599 2.399
 score URI_WP_DIRINDEX                       1.000 1.000 1.000 1.000
-score URI_WP_HACKED                         1.000 0.040 1.000 0.040
-score URI_WP_HACKED_2                       2.497 2.497 2.497 2.497
+score URI_WP_HACKED                         1.000 0.056 1.000 0.056
+score URI_WP_HACKED_2                       2.499 2.500 2.499 2.500
 score USB_DRIVES                            1.000 1.000 1.000 1.000
 score USER_IN_DKIM_WELCOMELIST              0.001 0.001 0.001 0.001
-score VFY_ACCT_NORDNS                       2.516 2.061 2.516 2.061
+score VFY_ACCT_NORDNS                       2.978 2.064 2.978 2.064
 score VPS_NO_NTLD                           1.000 1.000 1.000 1.000
-score WALMART_IMG_NOT_RCVD_WAL              1.681 2.464 1.681 2.464
-score WANT_TO_ORDER                         2.746 2.225 2.746 2.225
+score WALMART_IMG_NOT_RCVD_WAL              2.389 0.656 2.389 0.656
+score WANT_TO_ORDER                         2.749 2.243 2.749 2.243
 score WORD_INVIS                            1.000 1.000 1.000 1.000
-score WORD_INVIS_MANY                       2.399 2.996 2.399 2.996
-score XFER_LOTSA_MONEY                      0.741 0.998 0.741 0.998
-score XM_DIGITS_ONLY                        0.551 0.001 0.551 0.001
-score XM_RANDOM                             2.497 0.947 2.497 0.947
-score XM_RECPTID                            2.996 2.996 2.996 2.996
+score WORD_INVIS_MANY                       2.403 2.999 2.403 2.999
+score XFER_LOTSA_MONEY                      0.763 0.999 0.763 0.999
+score XM_DIGITS_ONLY                        0.082 0.001 0.082 0.001
+score XM_RANDOM                             2.499 0.939 2.499 0.939
+score XM_RECPTID                            2.999 2.999 2.999 2.999
 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                 0.034 0.290 0.034 0.290
-score YOU_INHERIT                           2.514 1.060 2.514 1.060
+score XPRIO_URL_SHORTNER                    0.999 0.999 0.999 0.999
+score YOUR_DELIVERY_ADDRESS                 0.037 0.315 0.037 0.315
+score YOU_INHERIT                           2.699 1.055 2.699 1.055
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index da5695c..2193841 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,235 +1,236 @@
 # Using score set 0 logs for revision 1891844 from:
 # ham-darxus.r1891844.log ham-ena-week0.r1891844.log ham-ena-week1.r1891844.log ham-ena-week2.r1891844.log ham-ena-week3.r1891844.log ham-ena-week4.r1891844.log ham-giovanni-ham.r1891844.log ham-giovanni-spammy.r1891844.log ham-giovanni-spam.r1891844.log ham-grenier.r1891844.log ham-hege.r1891844.log ham-llanga.r1891844.log ham-mmiroslaw-mails-ham.r1891844.log ham-mmiroslaw-mails-spam.r1891844.log ham-pds.r1891844.log ham-spamsponge.r1891844.log ham-thendrikx.r1891844.log ham-tsz-spam-corpus.r1891844.log spam-darxus.r1891844.log spam-ena-week0.r1891844.log spam-ena-week1.r1891844.log spam-ena-week2.r1891844.log spam-ena-week3.r1891844.log spam-ena-week4.r1891844.log spam-giovanni-ham.r1891844.log spam-giovanni-spammy.r1891844.log spam-giovanni-spam.r1891844.log spam-grenier.r1891844.log spam-hege.r1891844.log spam-llanga.r1891844.log spam-mmiroslaw-mails-ham.r1891844.log spam-mmiroslaw-mails-spam.r1891844.log spam-pds.r1891844.log spam-spamsponge.r1891844.log spam-thendrikx.r1891844.log spam-tsz-spam-corpus.r1891844.log
 
-score ACCT_PHISHING_MANY             2.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.897
-score ADMITS_SPAM                    3.595
-score ADVANCE_FEE_2_NEW_FORM         0.001
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
-score ADVANCE_FEE_2_NEW_MONEY        1.997
-score ADVANCE_FEE_3_NEW              3.066
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.811
-score ADVANCE_FEE_3_NEW_MONEY        2.083
-score ADVANCE_FEE_4_NEW              2.696
-score ADVANCE_FEE_4_NEW_FRM_MNY      2.464
-score ADVANCE_FEE_4_NEW_MONEY        0.488
-score ADVANCE_FEE_5_NEW              2.796
-score ADVANCE_FEE_5_NEW_FRM_MNY      1.578
+score AC_FROM_MANY_DOTS              2.999
+score AC_HTML_NONSENSE_TAGS          1.896
+score ADMITS_SPAM                    3.599
+score ADVANCE_FEE_2_NEW_FORM         0.326
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
+score ADVANCE_FEE_2_NEW_MONEY        1.999
+score ADVANCE_FEE_3_NEW              2.965
+score ADVANCE_FEE_3_NEW_FRM_MNY      2.335
+score ADVANCE_FEE_3_NEW_MONEY        2.060
+score ADVANCE_FEE_4_NEW              2.699
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.220
+score ADVANCE_FEE_4_NEW_MONEY        0.489
+score ADVANCE_FEE_5_NEW              2.699
+score ADVANCE_FEE_5_NEW_FRM_MNY      0.661
 score ADVANCE_FEE_5_NEW_MONEY        0.001
-score AD_PREFS                       0.095
-score ALIBABA_IMG_NOT_RCVD_ALI       2.497
-score AMAZON_IMG_NOT_RCVD_AMZN       1.645
-score APP_DEVELOPMENT_NORDNS         1.997
+score AD_PREFS                       0.499
+score ALIBABA_IMG_NOT_RCVD_ALI       2.499
+score AMAZON_IMG_NOT_RCVD_AMZN       2.499
+score APP_DEVELOPMENT_NORDNS         1.999
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.812
-score BEBEE_IMG_NOT_RCVD_BB          1.656
-score BIGNUM_EMAILS_FREEM            2.996
-score BIGNUM_EMAILS_MANY             2.996
-score BITCOIN_MALF_HTML              3.497
-score BITCOIN_ONAN                   2.996
-score BITCOIN_SPAM_02                1.857
-score BITCOIN_SPAM_03                2.497
-score BITCOIN_SPAM_07                3.497
-score BITCOIN_XPRIO                  0.001 # force non-zero
-score BITCOIN_YOUR_INFO              2.996
-score BOGUS_MIME_VERSION             3.496
-score BOGUS_MSM_HDRS                 1.300
-score BULK_RE_SUSP_NTLD              0.998
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.305
+score BEBEE_IMG_NOT_RCVD_BB          0.001
+score BIGNUM_EMAILS_FREEM            2.999
+score BIGNUM_EMAILS_MANY             2.999
+score BITCOIN_MALF_HTML              3.499
+score BITCOIN_ONAN                   3.000
+score BITCOIN_SPAM_02                1.859
+score BITCOIN_SPAM_03                2.499
+score BITCOIN_SPAM_07                3.499
+score BITCOIN_XPRIO                  0.001
+score BITCOIN_YOUR_INFO              1.500
+score BOGUS_MIME_VERSION             3.500
+score BOGUS_MSM_HDRS                 1.718
+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               3.096
-score DETAILS_OF_PRODUCT             1.248
+score CONTENT_AFTER_HTML             2.500
+score CTE_8BIT_MISMATCH              1.000
+score DEAR_BENEFICIARY               3.099
+score DETAILS_OF_PRODUCT             1.249
 score DX_TEXT_03                     0.899
-score EBAY_IMG_NOT_RCVD_EBAY         0.882
+score EBAY_IMG_NOT_RCVD_EBAY         2.276
 score ENCRYPTED_MESSAGE              -0.898
-score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  3.995
-score FAKE_REPLY_B                   3.895
-score FILL_THIS_FORM                 1.198
+score FACEBOOK_IMG_NOT_RCVD_FB       1.999
+score FAKE_REPLY_A1                  3.999
+score FAKE_REPLY_B                   3.899
+score FILL_THIS_FORM                 1.200
 score FONT_INVIS_DIRECT              2.395
-score FONT_INVIS_DOTGOV              3.497
-score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_LONG_LINE           2.996
-score FONT_INVIS_MSGID               2.497
-score FONT_INVIS_NORDNS              2.123
+score 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.331
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.246
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROMSPACE                      3.096
-score FROM_2_EMAILS_SHORT            2.568
-score FROM_IN_TO_AND_SUBJ            2.498
-score FROM_MISSPACED                 1.891
+score FOUND_YOU                      3.249
+score FREEMAIL_FORGED_FROMDOMAIN     0.250
+score FROMSPACE                      3.099
+score FROM_2_EMAILS_SHORT            2.549
+score FROM_IN_TO_AND_SUBJ            1.578
+score FROM_MISSPACED                 0.643
 score FROM_MISSP_DYNIP               0.001
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            2.500
-score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.496
+score FROM_MISSP_FREEMAIL            2.904
+score FROM_MISSP_MSFT                0.001 # force non-zero
+score FROM_MISSP_PHISH               3.499
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              0.353
-score FROM_NAME_EQ_TO_G_DRIVE        0.402
-score FROM_NTLD_REPLY_FREEMAIL       1.579
-score FROM_SUSPICIOUS_NTLD           0.498
-score FROM_SUSPICIOUS_NTLD_FP        1.998
-score FSL_CTYPE_WIN1251              0.001 # force non-zero
-score FSL_HELO_FAKE                  3.096
+score FROM_MULTI_NORDNS              0.362
+score FROM_NAME_EQ_TO_G_DRIVE        1.499
+score FROM_NTLD_REPLY_FREEMAIL       1.999
+score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_SUSPICIOUS_NTLD_FP        1.999
+score FSL_CTYPE_WIN1251              0.001
+score FSL_HELO_FAKE                  3.100
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.497
+score FUZZY_AMAZON                   2.399
 score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
-score GOOGLE_DOC_SUSP                2.495
-score GOOG_REDIR_NORDNS              3.399
-score GOOG_STO_EMAIL_PHISH           2.293
-score GOOG_STO_HTML_PHISH            2.061
-score GOOG_STO_HTML_PHISH_MANY       3.216
-score GOOG_STO_IMG_HTML              2.996
-score GOOG_STO_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       1.997
-score HDRS_LCASE_IMGONLY             0.098
-score HDRS_MISSP                     1.693
-score HDR_ORDER_FTSDMCXX_DIRECT      1.348
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
+score GOOGLE_DOC_SUSP                2.498
+score GOOG_REDIR_NORDNS              2.914
+score GOOG_STO_EMAIL_PHISH           2.867
+score GOOG_STO_HTML_PHISH            2.711
+score GOOG_STO_HTML_PHISH_MANY       3.595
+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                     2.166
+score HDR_ORDER_FTSDMCXX_DIRECT      0.856
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
-score HELO_NO_DOMAIN                 0.001 # force non-zero
-score HK_NAME_FM_MR_MRS              1.498
-score HK_NAME_MR_MRS                 0.998
-score HK_RANDOM_ENVFROM              0.998
-score HK_RANDOM_FROM                 0.998
-score HK_RANDOM_REPLYTO              0.998
-score HK_SCAM                        0.483
-score HOSTED_IMG_DIRECT_MX           1.768
-score HOSTED_IMG_FREEM               3.497
-score HOSTED_IMG_MULTI               1.092
-score HOSTED_IMG_MULTI_PUB_01        2.997
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score HELO_NO_DOMAIN                 0.001
+score HK_NAME_FM_MR_MRS              1.500
+score HK_NAME_MR_MRS                 0.999
+score HK_RANDOM_ENVFROM              0.999
+score HK_RANDOM_FROM                 0.999
+score HK_RANDOM_REPLYTO              0.999
+score HK_SCAM                        0.584
+score HOSTED_IMG_DIRECT_MX           2.395
+score HOSTED_IMG_FREEM               3.500
+score HOSTED_IMG_MULTI               1.427
+score HOSTED_IMG_MULTI_PUB_01        2.999
 score HTML_ENTITY_ASCII              2.999
-score HTML_OFF_PAGE                  2.996
-score HTML_TAG_BALANCE_CENTER        2.097
-score HTML_TEXT_INVISIBLE_STYLE      2.083
-score IMG_ONLY_FM_DOM_INFO           1.275
-score JH_SPAMMY_HEADERS              3.496
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.497
-score LONG_HEX_URI                   2.996
-score LONG_IMG_URI                   0.890
-score LONG_INVISIBLE_TEXT            1.735
+score HTML_OFF_PAGE                  2.999
+score HTML_TAG_BALANCE_CENTER        1.866
+score HTML_TEXT_INVISIBLE_STYLE      2.319
+score IMG_ONLY_FM_DOM_INFO           1.268
+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.883
+score LONG_INVISIBLE_TEXT            1.780
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    0.986
-score LOTTO_DEPT                     1.997
+score LOTTO_AGENT                    1.336
+score LOTTO_DEPT                     1.999
 score MALWARE_NORDNS                 2.103
-score MANY_SPAN_IN_TEXT              2.397
-score MILLION_HUNDRED                3.196
-score MILLION_USD                    0.216
-score MIMEOLE_DIRECT_TO_MX           0.553
-score MIXED_AREA_CASE                1.547
-score MIXED_CENTER_CASE              1.630
-score MIXED_ES                       2.997
-score MIXED_FONT_CASE                1.342
-score MIXED_HREF_CASE                1.896
-score MIXED_IMG_CASE                 2.570
-score MONEY_ATM_CARD                 1.911
+score MANY_SPAN_IN_TEXT              2.400
+score MILLION_HUNDRED                3.099
+score MILLION_USD                    0.123
+score MIMEOLE_DIRECT_TO_MX           1.042
+score MIXED_AREA_CASE                2.149
+score MIXED_CENTER_CASE              2.433
+score MIXED_ES                       3.000
+score MIXED_FONT_CASE                1.709
+score MIXED_HREF_CASE                1.999
+score MIXED_IMG_CASE                 1.124
+score MONEY_ATM_CARD                 1.958
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               1.239
-score MONEY_FRAUD_3                  0.001
-score MONEY_FRAUD_5                  0.657
-score MONEY_FRAUD_8                  0.785
-score MONEY_FREEMAIL_REPTO           2.996
-score MONEY_FROM_41                  1.997
+score MONEY_FORM_SHORT               1.338
+score MONEY_FRAUD_3                  0.001 # force non-zero
+score MONEY_FRAUD_5                  0.001
+score MONEY_FRAUD_8                  1.155
+score MONEY_FREEMAIL_REPTO           2.999
+score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.671
-score MSGID_WSP_TRAIL                1.062
-score MSMAIL_PRI_ABNORMAL            0.314
-score NAME_EMAIL_DIFF                1.917
-score NA_DOLLARS                     0.829
-score NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.246
-score NOT_SPAM                       3.296
-score NO_FM_NAME_IP_HOSTN            0.288
+score MONEY_NOHTML                   1.913
+score MSGID_WSP_TRAIL                1.915
+score MSMAIL_PRI_ABNORMAL            1.499
+score NAME_EMAIL_DIFF                1.939
+score NA_DOLLARS                     0.215
+score NEW_PRODUCTS                   1.249
+score NICE_REPLY_A                   -1.156
+score NOT_SPAM                       3.199
+score NO_FM_NAME_IP_HOSTN            0.282
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.999
+score NUMBEREND_LINKBAIT             0.595
 score OBFU_TEXT_ATTACH               0.001
-score ODD_FREEM_REPTO                2.996
-score OFFER_ONLY_AMERICA             1.650
-score ONLINE_MKTG_CNSLT              2.596
-score ORDER_TODAY                    1.569
-score PDS_BTC_ID                     0.498
-score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   1.923
-score PDS_DBL_URL_TNB_RUNON          1.997
+score ODD_FREEM_REPTO                3.000
+score OFFER_ONLY_AMERICA             1.430
+score ONLINE_MKTG_CNSLT              2.600
+score ORDER_TODAY                    0.204
+score PDS_BTC_ID                     0.500
+score PDS_BTC_MSGID                  0.001 # force non-zero
+score PDS_BTC_NTLD                   1.825
+score PDS_DBL_URL_TNB_RUNON          1.999
 score PDS_FRNOM_TODOM_DBL_URL        1.499
-score PDS_FRNOM_TODOM_NAKED_TO       1.498
-score PDS_FROM_2_EMAILS_SHRTNER      1.013
-score PDS_FROM_NAME_TO_DOMAIN        1.997
-score PDS_HP_HELO_NORDNS             0.998
-score PDS_OTHER_BAD_TLD              1.997
-score PDS_PHP_EVAL                   1.498
+score PDS_FRNOM_TODOM_NAKED_TO       1.499
+score PDS_FROM_2_EMAILS_SHRTNER      1.401
+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_SHORTFWD_URISHRT_FP        1.499
 score PDS_TINYSUBJ_URISHRT           1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
-score PDS_TO_EQ_FROM_NAME            3.196
-score PHP_ORIG_SCRIPT                2.249
-score PHP_ORIG_SCRIPT_EVAL           2.996
-score PHP_SCRIPT                     2.497
-score PP_MIME_FAKE_ASCII_TEXT        0.998
-score RAND_HEADER_LIST_SPOOF         2.996
-score RAND_MKTG_HEADER               1.997
-score RATWARE_NO_RDNS                1.892
-score RDNS_NUM_TLD_XM                1.628
-score READY_TO_SHIP                  1.248
-score REPLYTO_EMPTY                  2.397
-score REPTO_419_FRAUD                2.938
-score REPTO_419_FRAUD_GM             2.996
-score REPTO_419_FRAUD_GM_LOOSE       0.998
-score RISK_FREE                      3.096
-score SCC_NEWBIE_HASBEENS            1.717
-score SENDGRID_REDIR                 1.498
-score SERGIO_SUBJECT_VIAGRA01        3.095
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_IMG            0.973
-score SHORT_SHORTNER                 1.997
-score STATIC_XPRIO_OLE               1.552
-score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
-score TARINGANET_IMG_NOT_RCVD_TN     1.999
-score THIS_AD                        1.298
-score THIS_IS_ADV_SUSP_NTLD          1.477
-score TO_EQ_FM_DIRECT_MX             0.001 # force non-zero
-score TO_IN_SUBJ                     0.098
-score TO_NO_BRKTS_FROM_MSSP          2.497
-score TO_NO_BRKTS_HTML_IMG           1.997
-score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_NORDNS_HTML        1.997
-score TO_NO_BRKTS_PCNT               2.498
-score TRANSFORM_LIFE                 2.497
-score TVD_PH_BODY_META               3.096
-score TVD_RCVD_SPACE_BRACKET         2.797
-score UNDISC_FREEM                   3.096
-score UNDISC_MONEY                   3.396
-score URI_DEOBFU_INSTR               4.395
-score URI_DOTEDU                     1.997
-score URI_DQ_UNSUB                   2.497
-score URI_FIREBASEAPP                2.996
-score URI_GOOGLE_PROXY               3.096
-score URI_GOOG_STO_SPAMMY            2.996
-score URI_LONG_REPEAT                2.497
-score URI_PHISH                      3.995
-score URI_PHP_REDIR                  3.496
-score URI_TRY_3LD                    1.937
-score URI_WPADMIN                    2.596
-score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                2.516
-score WALMART_IMG_NOT_RCVD_WAL       1.681
-score WANT_TO_ORDER                  2.746
-score WORD_INVIS_MANY                2.399
-score XFER_LOTSA_MONEY               0.741
-score XM_DIGITS_ONLY                 0.551
-score XM_RANDOM                      2.497
-score XM_RECPTID                     2.996
-score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          0.034
-score YOU_INHERIT                    2.514
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
+score PDS_TO_EQ_FROM_NAME            3.200
+score PHP_ORIG_SCRIPT                2.251
+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                0.649
+score RDNS_NUM_TLD_XM                0.322
+score READY_TO_SHIP                  1.249
+score REPLYTO_EMPTY                  2.399
+score REPTO_419_FRAUD                1.936
+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.799
+score SENDGRID_REDIR                 1.499
+score SEO_SUSP_NTLD                  1.199
+score SERGIO_SUBJECT_VIAGRA01        3.932
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
+score SHORTENER_SHORT_IMG            1.587
+score SHORT_SHORTNER                 1.999
+score STATIC_XPRIO_OLE               1.073
+score TAGSTAT_IMG_NOT_RCVD_TGST      1.999
+score TARINGANET_IMG_NOT_RCVD_TN     1.892
+score THIS_AD                        1.299
+score THIS_IS_ADV_SUSP_NTLD          0.001
+score TO_EQ_FM_DIRECT_MX             0.001
+score TO_IN_SUBJ                     0.100
+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        1.999
+score TO_NO_BRKTS_PCNT               2.499
+score TRANSFORM_LIFE                 2.499
+score TVD_PH_BODY_META               2.999
+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.500
+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                      3.999
+score URI_PHP_REDIR                  3.499
+score URI_TRY_3LD                    1.933
+score URI_WPADMIN                    2.599
+score URI_WP_HACKED_2                2.499
+score VFY_ACCT_NORDNS                2.978
+score WALMART_IMG_NOT_RCVD_WAL       2.389
+score WANT_TO_ORDER                  2.749
+score WORD_INVIS_MANY                2.403
+score XFER_LOTSA_MONEY               0.763
+score XM_DIGITS_ONLY                 0.082
+score XM_RANDOM                      2.499
+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
@@ -264,7 +265,6 @@
 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
@@ -291,7 +291,6 @@
 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
@@ -346,7 +345,6 @@
 score REPTO_419_FRAUD_YJ             1.000
 score REPTO_419_FRAUD_YN             1.000
 score SENDGRID_REDIR_PHISH           1.000
-score SEO_SUSP_NTLD                  1.000
 score SHORT_IMG_SUSP_NTLD            1.000
 score SPOOFED_FREEMAIL_NO_RDNS       1.000
 score SPOOF_GMAIL_MID                1.000
@@ -357,7 +355,6 @@
 score TONLINE_FAKE_DKIM              1.000
 score TO_NAME_SUBJ_NO_RDNS           1.000
 score TO_NO_BRKTS_MSFT               1.000
-score TVD_SPACE_ENCODED              1.000
 score TVD_SPACE_RATIO_MINFP          1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index 87dda29..c8be2c4 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -1,260 +1,258 @@
 # Using score set 1 logs for revision 1891766 from:
 # ham-net-darxus.r1891766.log ham-net-ena-week0.r1891766.log ham-net-ena-week1.r1891766.log ham-net-ena-week2.r1891766.log ham-net-ena-week3.r1891766.log ham-net-ena-week4.r1891766.log ham-net-grenier.r1891766.log ham-net-hege.r1891766.log ham-net-jhardin.r1891766.log ham-net-llanga.r1891766.log ham-net-mmiroslaw-mails-ham.r1891766.log ham-net-mmiroslaw-mails-spam.r1891766.log ham-net-pds.r1891766.log ham-net-spamsponge.r1891766.log ham-net-thendrikx.r1891766.log ham-net-tsz-spam-corpus.r1891766.log spam-net-darxus.r1891766.log spam-net-ena-week0.r1891766.log spam-net-ena-week1.r1891766.log spam-net-ena-week2.r1891766.log spam-net-ena-week3.r1891766.log spam-net-ena-week4.r1891766.log spam-net-grenier.r1891766.log spam-net-hege.r1891766.log spam-net-jhardin.r1891766.log spam-net-llanga.r1891766.log spam-net-mmiroslaw-mails-ham.r1891766.log spam-net-mmiroslaw-mails-spam.r1891766.log spam-net-pds.r1891766.log spam-net-spamsponge.r1891766.log spam-net-thendrikx.r1891766.log spam-net-tsz-spam-corpus.r1891766.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.396
-score ADVANCE_FEE_2_NEW_FORM         0.471
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
+score AC_FROM_MANY_DOTS              2.999
+score AC_HTML_NONSENSE_TAGS          1.999
+score ADMITS_SPAM                    3.399
+score ADVANCE_FEE_2_NEW_FORM         1.596
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
 score ADVANCE_FEE_2_NEW_MONEY        0.001
-score ADVANCE_FEE_3_NEW              3.407
+score ADVANCE_FEE_3_NEW              3.404
 score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_3_NEW_MONEY        0.982
-score ADVANCE_FEE_4_NEW              2.397
+score ADVANCE_FEE_3_NEW_MONEY        1.001
+score ADVANCE_FEE_4_NEW              2.399
+score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_4_NEW_MONEY        0.001
-score ADVANCE_FEE_5_NEW              2.497
+score ADVANCE_FEE_5_NEW              2.499
 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.163
+score AD_PREFS                       0.500
+score ALIBABA_IMG_NOT_RCVD_ALI       1.461
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         0.205
+score APP_DEVELOPMENT_NORDNS         0.332
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score BIGNUM_EMAILS_FREEM            2.033
-score BITCOIN_MALF_HTML              3.496
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.372
+score BIGNUM_EMAILS_FREEM            1.633
+score BITCOIN_MALF_HTML              3.499
 score BITCOIN_MALWARE                0.001
-score BITCOIN_ONAN                   2.996
-score BITCOIN_SPAM_02                1.326
-score BITCOIN_SPAM_03                1.532
-score BITCOIN_SPAM_05                2.497
-score BITCOIN_SPAM_07                3.089
-score BITCOIN_XPRIO                  0.149
-score BITCOIN_YOUR_INFO              2.308
+score BITCOIN_ONAN                   2.999
+score BITCOIN_SPAM_02                1.185
+score BITCOIN_SPAM_03                2.250
+score BITCOIN_SPAM_05                2.499
+score BITCOIN_SPAM_07                3.255
+score BITCOIN_XPRIO                  0.176
+score BITCOIN_YOUR_INFO              2.314
 score BODY_URI_ONLY                  0.001
-score BOGUS_MIME_VERSION             3.278
+score BOGUS_MIME_VERSION             3.259
 score CK_HELO_GENERIC                0.008
-score CONTENT_AFTER_HTML             2.418
+score CONTENT_AFTER_HTML             2.417
 score CTE_8BIT_MISMATCH              0.001
-score DEAR_BENEFICIARY               2.896
-score DETAILS_OF_PRODUCT             1.248
-score DKIMWL_BL                      2.334
-score DKIMWL_WL_HIGH                 -0.717
+score DEAR_BENEFICIARY               2.799
+score DETAILS_OF_PRODUCT             1.249
+score DKIMWL_BL                      2.320
+score DKIMWL_WL_HIGH                 -0.719
 score DKIMWL_WL_MED                  -0.001
-score DKIMWL_WL_MEDHI                -0.275
-score DX_TEXT_03                     0.698
-score DYNAMIC_IMGUR                  2.851
-score EBAY_IMG_NOT_RCVD_EBAY         1.666
-score ENCRYPTED_MESSAGE              -0.998
-score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  2.642
-score FAKE_REPLY_B                   3.695
-score FILL_THIS_FORM                 0.001 # force non-zero
-score FONT_INVIS_DIRECT              0.001
-score FONT_INVIS_DOTGOV              3.496
-score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_MSGID               1.842
-score FONT_INVIS_NORDNS              1.749
-score FORGED_SPF_HELO                1.597
+score DKIMWL_WL_MEDHI                -0.912
+score DX_TEXT_03                     0.700
+score DYNAMIC_IMGUR                  1.922
+score EBAY_IMG_NOT_RCVD_EBAY         0.135
+score ENCRYPTED_MESSAGE              -1.000
+score FACEBOOK_IMG_NOT_RCVD_FB       1.999
+score FAKE_REPLY_A1                  3.660
+score FAKE_REPLY_B                   3.699
+score FILL_THIS_FORM                 0.001
+score FONT_INVIS_DIRECT              0.001 # force non-zero
+score FONT_INVIS_DOTGOV              3.500
+score FONT_INVIS_HTML_NOHTML         2.999
+score FONT_INVIS_MSGID               1.849
+score FONT_INVIS_NORDNS              2.242
+score FORGED_SPF_HELO                1.599
 score FORM_FRAUD                     0.001
-score FORM_FRAUD_3                   2.596
-score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      1.913
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROMSPACE                      2.595
-score FROM_2_EMAILS_SHORT            2.996
-score FROM_BANK_NOAUTH               0.998
-score FROM_FMBLA_NEWDOM              1.498
-score FROM_FMBLA_NEWDOM14            0.998
-score FROM_FMBLA_NEWDOM28            0.798
-score FROM_GOV_DKIM_AU               -0.752
+score FORM_FRAUD_3                   2.599
+score FORM_FRAUD_5                   0.001 # force non-zero
+score FOUND_YOU                      1.349
+score FREEMAIL_FORGED_FROMDOMAIN     0.250
+score FROMSPACE                      2.418
+score FROM_2_EMAILS_SHORT            2.999
+score FROM_BANK_NOAUTH               0.999
+score FROM_FMBLA_NEWDOM              1.499
+score FROM_FMBLA_NEWDOM14            0.999
+score FROM_FMBLA_NEWDOM28            0.799
+score FROM_GOV_DKIM_AU               -0.740
 score FROM_GOV_SPOOF                 0.001
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               2.197
+score FROM_MISSP_DYNIP               2.199
 score FROM_MISSP_EH_MATCH            0.001
 score FROM_MISSP_FREEMAIL            0.001
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.496
+score FROM_MISSP_PHISH               3.499
 score FROM_MISSP_REPLYTO             0.001
 score FROM_MISSP_SPF_FAIL            0.001
-score FROM_MISSP_USER                0.001 # force non-zero
-score FROM_MULTI_NORDNS              2.346
-score FROM_NAME_EQ_TO_G_DRIVE        0.001
-score FROM_NTLD_REPLY_FREEMAIL       1.121
+score FROM_MISSP_USER                0.001
+score FROM_MULTI_NORDNS              0.509
+score FROM_NAME_EQ_TO_G_DRIVE        1.355
+score FROM_NTLD_REPLY_FREEMAIL       0.660
 score FROM_PAYPAL_SPOOF              0.001
 score FROM_SUSPICIOUS_NTLD           0.499
-score FROM_SUSPICIOUS_NTLD_FP        1.099
-score FSL_BULK_SIG                   2.617
+score FROM_SUSPICIOUS_NTLD_FP        1.026
+score FSL_BULK_SIG                   2.622
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  2.896
+score FSL_HELO_FAKE                  2.899
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.197
-score GB_FAKE_RF_SHORT               1.997
-score GB_FREEMAIL_DISPTO             0.498
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
-score GOOGLE_DOC_SUSP                2.996
-score GOOG_REDIR_NORDNS              2.996
-score GOOG_STO_EMAIL_PHISH           2.563
-score GOOG_STO_HTML_PHISH            2.424
-score GOOG_STO_HTML_PHISH_MANY       1.648
-score GOOG_STO_IMG_HTML              2.996
-score GOOG_STO_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       1.025
-score HDRS_LCASE                     0.098
-score HDRS_LCASE_IMGONLY             0.001 # force non-zero
+score FUZZY_AMAZON                   2.199
+score GB_FAKE_RF_SHORT               1.999
+score GB_FREEMAIL_DISPTO             0.499
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.500
+score GOOGLE_DOC_SUSP                2.999
+score GOOG_REDIR_NORDNS              2.999
+score GOOG_STO_EMAIL_PHISH           2.473
+score GOOG_STO_HTML_PHISH            2.112
+score GOOG_STO_HTML_PHISH_MANY       2.856
+score GOOG_STO_IMG_HTML              2.999
+score GOOG_STO_NOIMG_HTML            2.999
+score HAS_X_OUTGOING_SPAM_STAT       0.964
+score HDRS_LCASE_IMGONLY             0.021
 score HDRS_MISSP                     0.001
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
-score HDR_ORDER_FTSDMCXX_NORDNS      0.001 # force non-zero
-score HEADER_FROM_DIFFERENT_DOMAINS  0.248
+score HDR_ORDER_FTSDMCXX_NORDNS      0.001
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
-score HK_NAME_FM_MR_MRS              0.749
-score HK_NAME_MR_MRS                 0.218
-score HK_RANDOM_ENVFROM              0.998
-score HK_RANDOM_FROM                 0.998
-score HK_RANDOM_REPLYTO              0.395
+score HK_NAME_FM_MR_MRS              0.795
+score HK_NAME_MR_MRS                 0.105
+score HK_RANDOM_ENVFROM              0.999
+score HK_RANDOM_FROM                 0.982
+score HK_RANDOM_REPLYTO              0.999
 score HK_SCAM                        0.001
-score HOSTED_IMG_DIRECT_MX           1.988
-score HOSTED_IMG_FREEM               3.496
-score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_OFF_PAGE                  2.663
-score HTML_SINGLET_MANY              0.998
-score HTML_TEXT_INVISIBLE_FONT       0.146
-score HTML_TEXT_INVISIBLE_STYLE      2.084
-score JH_SPAMMY_HEADERS              3.496
-score KHOP_FAKE_EBAY                 1.099
-score KHOP_HELO_FCRDNS               0.398
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.499
-score LONG_HEX_URI                   0.948
-score LONG_IMG_URI                   0.943
-score LONG_INVISIBLE_TEXT            0.171
+score HOSTED_IMG_DIRECT_MX           3.224
+score HOSTED_IMG_FREEM               3.499
+score HOSTED_IMG_MULTI_PUB_01        2.999
+score HTML_OFF_PAGE                  2.016
+score HTML_SINGLET_MANY              0.976
+score HTML_TEXT_INVISIBLE_FONT       0.424
+score HTML_TEXT_INVISIBLE_STYLE      2.092
+score JH_SPAMMY_HEADERS              3.499
+score KHOP_HELO_FCRDNS               0.399
+score LINKEDIN_IMG_NOT_RCVD_LNKN     2.471
+score LONG_HEX_URI                   0.944
+score LONG_IMG_URI                   0.935
+score LONG_INVISIBLE_TEXT            0.161
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.498
-score MALWARE_NORDNS                 0.352
-score MANY_SPAN_IN_TEXT              2.297
-score MILLION_HUNDRED                2.896
+score LOTTO_AGENT                    1.499
+score MALWARE_NORDNS                 0.510
+score MANY_SPAN_IN_TEXT              2.299
+score MILLION_HUNDRED                2.899
 score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           0.320
-score MIXED_AREA_CASE                0.641
-score MIXED_CENTER_CASE              2.164
-score MIXED_ES                       2.598
-score MIXED_FONT_CASE                1.594
-score MIXED_HREF_CASE                0.606
-score MIXED_IMG_CASE                 1.623
+score MIMEOLE_DIRECT_TO_MX           0.165
+score MIXED_AREA_CASE                1.214
+score MIXED_CENTER_CASE              1.591
+score MIXED_ES                       2.600
+score MIXED_FONT_CASE                0.288
+score MIXED_HREF_CASE                0.456
+score MIXED_IMG_CASE                 1.980
 score MONEY_ATM_CARD                 0.001
 score MONEY_FORM                     0.001
 score MONEY_FORM_SHORT               0.001
 score MONEY_FRAUD_3                  0.001
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.329
-score MONEY_FROM_41                  1.997
+score MONEY_FREEMAIL_REPTO           1.213
+score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   0.948
-score MSGID_WSP_TRAIL                0.675
-score MSMAIL_PRI_ABNORMAL            1.179
-score NAME_EMAIL_DIFF                2.441
-score NA_DOLLARS                     0.538
-score NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.125
-score NOT_SPAM                       3.096
-score NO_FM_NAME_IP_HOSTN            0.491
-score NSL_RCVD_FROM_USER             0.001 # force non-zero
+score MONEY_NOHTML                   1.169
+score MSGID_WSP_TRAIL                0.555
+score MSMAIL_PRI_ABNORMAL            0.517
+score NAME_EMAIL_DIFF                2.445
+score NA_DOLLARS                     0.174
+score NEW_PRODUCTS                   1.249
+score NICE_REPLY_A                   -0.202
+score NOT_SPAM                       2.999
+score NO_FM_NAME_IP_HOSTN            0.492
+score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.575
-score ODD_FREEM_REPTO                2.448
-score ONLINE_MKTG_CNSLT              2.397
-score ORDER_TODAY                    1.240
-score PDS_BTC_ID                     0.498
+score NUMBEREND_LINKBAIT             0.555
+score ODD_FREEM_REPTO                2.797
+score ONLINE_MKTG_CNSLT              2.399
+score ORDER_TODAY                    0.767
+score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   1.220
-score PDS_FRNOM_TODOM_DBL_URL        1.498
-score PDS_FRNOM_TODOM_NAKED_TO       1.498
-score PDS_FROM_2_EMAILS_SHRTNER      1.498
-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_BTC_NTLD                   1.028
+score PDS_FRNOM_TODOM_DBL_URL        1.499
+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.216
-score PDS_TINYSUBJ_URISHRT           1.498
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.594
-score PDS_TO_EQ_FROM_NAME            2.590
-score PHP_ORIG_SCRIPT                0.585
-score PHP_ORIG_SCRIPT_EVAL           2.996
-score PHP_SCRIPT                     2.265
-score PP_MIME_FAKE_ASCII_TEXT        0.998
-score RAND_HEADER_LIST_SPOOF         2.996
-score RAND_MKTG_HEADER               1.997
-score RATWARE_NO_RDNS                1.647
-score RCVD_IN_MSPIKE_H2              -0.001
-score RDNS_NUM_TLD_XM                1.887
-score READY_TO_SHIP                  1.248
-score REPTO_419_FRAUD                2.999
-score REPTO_419_FRAUD_GM             2.715
-score REPTO_419_FRAUD_GM_LOOSE       0.998
-score RISK_FREE                      2.896
-score SCC_NEWBIE_HASBEENS            1.044
-score SENDGRID_REDIR                 1.098
-score SERGIO_SUBJECT_VIAGRA01        4.095
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_IMG            1.221
-score SHORT_SHORTNER                 0.676
-score SINGLETS_LOW_CONTRAST          2.718
-score SPOOFED_FREEMAIL               1.224
+score PDS_SHORTFWD_URISHRT_FP        1.334
+score PDS_TINYSUBJ_URISHRT           1.499
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.596
+score PDS_TO_EQ_FROM_NAME            3.099
+score PHP_ORIG_SCRIPT                0.590
+score PHP_ORIG_SCRIPT_EVAL           3.000
+score PHP_SCRIPT                     2.332
+score PP_MIME_FAKE_ASCII_TEXT        1.000
+score RAND_HEADER_LIST_SPOOF         3.000
+score RAND_MKTG_HEADER               1.999
+score RATWARE_NO_RDNS                2.124
+score RCVD_IN_MSPIKE_H2              -0.001 # force non-zero
+score RDNS_NUM_TLD_XM                0.468
+score READY_TO_SHIP                  1.249
+score REPTO_419_FRAUD                2.760
+score REPTO_419_FRAUD_GM             2.999
+score REPTO_419_FRAUD_GM_LOOSE       0.999
+score RISK_FREE                      2.899
+score SCC_NEWBIE_HASBEENS            0.916
+score SENDGRID_REDIR                 1.355
+score SERGIO_SUBJECT_VIAGRA01        4.099
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
+score SHORTENER_SHORT_IMG            2.118
+score SHORT_SHORTNER                 0.696
+score SINGLETS_LOW_CONTRAST          3.299
+score SPOOFED_FREEMAIL               1.226
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            0.001
-score SPOOFED_FREEM_REPTO_CHN        0.646
-score SPOOF_GMAIL_MID                1.498
-score STATIC_XPRIO_OLE               1.997
-score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
+score SPOOFED_FREEM_REPTO_CHN        1.693
+score SPOOF_GMAIL_MID                1.499
+score STATIC_XPRIO_OLE               1.999
+score TAGSTAT_IMG_NOT_RCVD_TGST      1.999
 score THIS_AD                        0.999
-score TO_EQ_FM_DIRECT_MX             2.497
-score TO_EQ_FM_DOM_HTML_ONLY         2.696
+score TO_EQ_FM_DIRECT_MX             2.499
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
-score TO_EQ_FM_HTML_ONLY             1.514
+score TO_EQ_FM_HTML_ONLY             2.299
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.128
+score TO_IN_SUBJ                     0.099
+score TO_NAME_SUBJ_NO_RDNS           2.539
 score TO_NO_BRKTS_FROM_MSSP          0.001
-score TO_NO_BRKTS_HTML_IMG           0.078
-score TO_NO_BRKTS_HTML_ONLY          1.997
+score TO_NO_BRKTS_HTML_IMG           0.051
+score TO_NO_BRKTS_HTML_ONLY          1.999
 score TO_NO_BRKTS_MSFT               0.001
 score TO_NO_BRKTS_NORDNS_HTML        1.205
-score TO_NO_BRKTS_PCNT               2.497
-score TRANSFORM_LIFE                 2.497
-score TVD_PH_BODY_META               2.796
-score TVD_RCVD_SPACE_BRACKET         1.087
-score TVD_SPACE_ENCODED              0.001
+score TO_NO_BRKTS_PCNT               2.499
+score TRANSFORM_LIFE                 2.499
+score TVD_PH_BODY_META               2.799
+score TVD_RCVD_SPACE_BRACKET         1.836
 score TVD_SPACE_RATIO_MINFP          0.001
-score UNDISC_FREEM                   2.696
-score UNDISC_MONEY                   3.096
-score URI_DEOBFU_INSTR               4.195
-score URI_DOTEDU                     1.773
-score URI_DQ_UNSUB                   1.896
-score URI_FIREBASEAPP                2.996
-score URI_GOOGLE_PROXY               2.596
-score URI_GOOG_STO_SPAMMY            2.996
-score URI_LONG_REPEAT                2.351
+score UNDISC_FREEM                   2.699
+score UNDISC_MONEY                   3.100
+score URI_DEOBFU_INSTR               4.199
+score URI_DOTEDU                     1.955
+score URI_DQ_UNSUB                   2.059
+score URI_FIREBASEAPP                2.999
+score URI_GOOGLE_PROXY               2.599
+score URI_GOOG_STO_SPAMMY            2.999
+score URI_LONG_REPEAT                2.400
 score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      3.334
-score URI_PHP_REDIR                  3.496
-score URI_TRY_3LD                    1.997
-score URI_WPADMIN                    2.397
-score URI_WP_HACKED                  0.040
-score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                2.061
-score WALMART_IMG_NOT_RCVD_WAL       2.464
-score WANT_TO_ORDER                  2.225
-score WORD_INVIS_MANY                2.996
-score XFER_LOTSA_MONEY               0.998
+score URI_PHISH                      3.313
+score URI_PHP_REDIR                  3.499
+score URI_TRY_3LD                    1.999
+score URI_WPADMIN                    2.399
+score URI_WP_HACKED                  0.056
+score URI_WP_HACKED_2                2.500
+score VFY_ACCT_NORDNS                2.064
+score WALMART_IMG_NOT_RCVD_WAL       0.656
+score WANT_TO_ORDER                  2.243
+score WORD_INVIS_MANY                2.999
+score XFER_LOTSA_MONEY               0.999
 score XM_DIGITS_ONLY                 0.001
-score XM_RANDOM                      0.947
-score XM_RECPTID                     2.996
-score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          0.290
-score YOU_INHERIT                    1.060
+score XM_RANDOM                      0.939
+score XM_RECPTID                     2.999
+score XPRIO_URL_SHORTNER             0.999
+score YOUR_DELIVERY_ADDRESS          0.315
+score YOU_INHERIT                    1.055
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -291,7 +289,6 @@
 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
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index da5695c..2193841 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,235 +1,236 @@
 # Using score set 0 logs for revision 1891844 from:
 # ham-darxus.r1891844.log ham-ena-week0.r1891844.log ham-ena-week1.r1891844.log ham-ena-week2.r1891844.log ham-ena-week3.r1891844.log ham-ena-week4.r1891844.log ham-giovanni-ham.r1891844.log ham-giovanni-spammy.r1891844.log ham-giovanni-spam.r1891844.log ham-grenier.r1891844.log ham-hege.r1891844.log ham-llanga.r1891844.log ham-mmiroslaw-mails-ham.r1891844.log ham-mmiroslaw-mails-spam.r1891844.log ham-pds.r1891844.log ham-spamsponge.r1891844.log ham-thendrikx.r1891844.log ham-tsz-spam-corpus.r1891844.log spam-darxus.r1891844.log spam-ena-week0.r1891844.log spam-ena-week1.r1891844.log spam-ena-week2.r1891844.log spam-ena-week3.r1891844.log spam-ena-week4.r1891844.log spam-giovanni-ham.r1891844.log spam-giovanni-spammy.r1891844.log spam-giovanni-spam.r1891844.log spam-grenier.r1891844.log spam-hege.r1891844.log spam-llanga.r1891844.log spam-mmiroslaw-mails-ham.r1891844.log spam-mmiroslaw-mails-spam.r1891844.log spam-pds.r1891844.log spam-spamsponge.r1891844.log spam-thendrikx.r1891844.log spam-tsz-spam-corpus.r1891844.log
 
-score ACCT_PHISHING_MANY             2.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.897
-score ADMITS_SPAM                    3.595
-score ADVANCE_FEE_2_NEW_FORM         0.001
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
-score ADVANCE_FEE_2_NEW_MONEY        1.997
-score ADVANCE_FEE_3_NEW              3.066
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.811
-score ADVANCE_FEE_3_NEW_MONEY        2.083
-score ADVANCE_FEE_4_NEW              2.696
-score ADVANCE_FEE_4_NEW_FRM_MNY      2.464
-score ADVANCE_FEE_4_NEW_MONEY        0.488
-score ADVANCE_FEE_5_NEW              2.796
-score ADVANCE_FEE_5_NEW_FRM_MNY      1.578
+score AC_FROM_MANY_DOTS              2.999
+score AC_HTML_NONSENSE_TAGS          1.896
+score ADMITS_SPAM                    3.599
+score ADVANCE_FEE_2_NEW_FORM         0.326
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
+score ADVANCE_FEE_2_NEW_MONEY        1.999
+score ADVANCE_FEE_3_NEW              2.965
+score ADVANCE_FEE_3_NEW_FRM_MNY      2.335
+score ADVANCE_FEE_3_NEW_MONEY        2.060
+score ADVANCE_FEE_4_NEW              2.699
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.220
+score ADVANCE_FEE_4_NEW_MONEY        0.489
+score ADVANCE_FEE_5_NEW              2.699
+score ADVANCE_FEE_5_NEW_FRM_MNY      0.661
 score ADVANCE_FEE_5_NEW_MONEY        0.001
-score AD_PREFS                       0.095
-score ALIBABA_IMG_NOT_RCVD_ALI       2.497
-score AMAZON_IMG_NOT_RCVD_AMZN       1.645
-score APP_DEVELOPMENT_NORDNS         1.997
+score AD_PREFS                       0.499
+score ALIBABA_IMG_NOT_RCVD_ALI       2.499
+score AMAZON_IMG_NOT_RCVD_AMZN       2.499
+score APP_DEVELOPMENT_NORDNS         1.999
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.812
-score BEBEE_IMG_NOT_RCVD_BB          1.656
-score BIGNUM_EMAILS_FREEM            2.996
-score BIGNUM_EMAILS_MANY             2.996
-score BITCOIN_MALF_HTML              3.497
-score BITCOIN_ONAN                   2.996
-score BITCOIN_SPAM_02                1.857
-score BITCOIN_SPAM_03                2.497
-score BITCOIN_SPAM_07                3.497
-score BITCOIN_XPRIO                  0.001 # force non-zero
-score BITCOIN_YOUR_INFO              2.996
-score BOGUS_MIME_VERSION             3.496
-score BOGUS_MSM_HDRS                 1.300
-score BULK_RE_SUSP_NTLD              0.998
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.305
+score BEBEE_IMG_NOT_RCVD_BB          0.001
+score BIGNUM_EMAILS_FREEM            2.999
+score BIGNUM_EMAILS_MANY             2.999
+score BITCOIN_MALF_HTML              3.499
+score BITCOIN_ONAN                   3.000
+score BITCOIN_SPAM_02                1.859
+score BITCOIN_SPAM_03                2.499
+score BITCOIN_SPAM_07                3.499
+score BITCOIN_XPRIO                  0.001
+score BITCOIN_YOUR_INFO              1.500
+score BOGUS_MIME_VERSION             3.500
+score BOGUS_MSM_HDRS                 1.718
+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               3.096
-score DETAILS_OF_PRODUCT             1.248
+score CONTENT_AFTER_HTML             2.500
+score CTE_8BIT_MISMATCH              1.000
+score DEAR_BENEFICIARY               3.099
+score DETAILS_OF_PRODUCT             1.249
 score DX_TEXT_03                     0.899
-score EBAY_IMG_NOT_RCVD_EBAY         0.882
+score EBAY_IMG_NOT_RCVD_EBAY         2.276
 score ENCRYPTED_MESSAGE              -0.898
-score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  3.995
-score FAKE_REPLY_B                   3.895
-score FILL_THIS_FORM                 1.198
+score FACEBOOK_IMG_NOT_RCVD_FB       1.999
+score FAKE_REPLY_A1                  3.999
+score FAKE_REPLY_B                   3.899
+score FILL_THIS_FORM                 1.200
 score FONT_INVIS_DIRECT              2.395
-score FONT_INVIS_DOTGOV              3.497
-score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_LONG_LINE           2.996
-score FONT_INVIS_MSGID               2.497
-score FONT_INVIS_NORDNS              2.123
+score 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.331
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.246
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROMSPACE                      3.096
-score FROM_2_EMAILS_SHORT            2.568
-score FROM_IN_TO_AND_SUBJ            2.498
-score FROM_MISSPACED                 1.891
+score FOUND_YOU                      3.249
+score FREEMAIL_FORGED_FROMDOMAIN     0.250
+score FROMSPACE                      3.099
+score FROM_2_EMAILS_SHORT            2.549
+score FROM_IN_TO_AND_SUBJ            1.578
+score FROM_MISSPACED                 0.643
 score FROM_MISSP_DYNIP               0.001
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            2.500
-score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.496
+score FROM_MISSP_FREEMAIL            2.904
+score FROM_MISSP_MSFT                0.001 # force non-zero
+score FROM_MISSP_PHISH               3.499
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              0.353
-score FROM_NAME_EQ_TO_G_DRIVE        0.402
-score FROM_NTLD_REPLY_FREEMAIL       1.579
-score FROM_SUSPICIOUS_NTLD           0.498
-score FROM_SUSPICIOUS_NTLD_FP        1.998
-score FSL_CTYPE_WIN1251              0.001 # force non-zero
-score FSL_HELO_FAKE                  3.096
+score FROM_MULTI_NORDNS              0.362
+score FROM_NAME_EQ_TO_G_DRIVE        1.499
+score FROM_NTLD_REPLY_FREEMAIL       1.999
+score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_SUSPICIOUS_NTLD_FP        1.999
+score FSL_CTYPE_WIN1251              0.001
+score FSL_HELO_FAKE                  3.100
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.497
+score FUZZY_AMAZON                   2.399
 score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
-score GOOGLE_DOC_SUSP                2.495
-score GOOG_REDIR_NORDNS              3.399
-score GOOG_STO_EMAIL_PHISH           2.293
-score GOOG_STO_HTML_PHISH            2.061
-score GOOG_STO_HTML_PHISH_MANY       3.216
-score GOOG_STO_IMG_HTML              2.996
-score GOOG_STO_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       1.997
-score HDRS_LCASE_IMGONLY             0.098
-score HDRS_MISSP                     1.693
-score HDR_ORDER_FTSDMCXX_DIRECT      1.348
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
+score GOOGLE_DOC_SUSP                2.498
+score GOOG_REDIR_NORDNS              2.914
+score GOOG_STO_EMAIL_PHISH           2.867
+score GOOG_STO_HTML_PHISH            2.711
+score GOOG_STO_HTML_PHISH_MANY       3.595
+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                     2.166
+score HDR_ORDER_FTSDMCXX_DIRECT      0.856
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
-score HELO_NO_DOMAIN                 0.001 # force non-zero
-score HK_NAME_FM_MR_MRS              1.498
-score HK_NAME_MR_MRS                 0.998
-score HK_RANDOM_ENVFROM              0.998
-score HK_RANDOM_FROM                 0.998
-score HK_RANDOM_REPLYTO              0.998
-score HK_SCAM                        0.483
-score HOSTED_IMG_DIRECT_MX           1.768
-score HOSTED_IMG_FREEM               3.497
-score HOSTED_IMG_MULTI               1.092
-score HOSTED_IMG_MULTI_PUB_01        2.997
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score HELO_NO_DOMAIN                 0.001
+score HK_NAME_FM_MR_MRS              1.500
+score HK_NAME_MR_MRS                 0.999
+score HK_RANDOM_ENVFROM              0.999
+score HK_RANDOM_FROM                 0.999
+score HK_RANDOM_REPLYTO              0.999
+score HK_SCAM                        0.584
+score HOSTED_IMG_DIRECT_MX           2.395
+score HOSTED_IMG_FREEM               3.500
+score HOSTED_IMG_MULTI               1.427
+score HOSTED_IMG_MULTI_PUB_01        2.999
 score HTML_ENTITY_ASCII              2.999
-score HTML_OFF_PAGE                  2.996
-score HTML_TAG_BALANCE_CENTER        2.097
-score HTML_TEXT_INVISIBLE_STYLE      2.083
-score IMG_ONLY_FM_DOM_INFO           1.275
-score JH_SPAMMY_HEADERS              3.496
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.497
-score LONG_HEX_URI                   2.996
-score LONG_IMG_URI                   0.890
-score LONG_INVISIBLE_TEXT            1.735
+score HTML_OFF_PAGE                  2.999
+score HTML_TAG_BALANCE_CENTER        1.866
+score HTML_TEXT_INVISIBLE_STYLE      2.319
+score IMG_ONLY_FM_DOM_INFO           1.268
+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.883
+score LONG_INVISIBLE_TEXT            1.780
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    0.986
-score LOTTO_DEPT                     1.997
+score LOTTO_AGENT                    1.336
+score LOTTO_DEPT                     1.999
 score MALWARE_NORDNS                 2.103
-score MANY_SPAN_IN_TEXT              2.397
-score MILLION_HUNDRED                3.196
-score MILLION_USD                    0.216
-score MIMEOLE_DIRECT_TO_MX           0.553
-score MIXED_AREA_CASE                1.547
-score MIXED_CENTER_CASE              1.630
-score MIXED_ES                       2.997
-score MIXED_FONT_CASE                1.342
-score MIXED_HREF_CASE                1.896
-score MIXED_IMG_CASE                 2.570
-score MONEY_ATM_CARD                 1.911
+score MANY_SPAN_IN_TEXT              2.400
+score MILLION_HUNDRED                3.099
+score MILLION_USD                    0.123
+score MIMEOLE_DIRECT_TO_MX           1.042
+score MIXED_AREA_CASE                2.149
+score MIXED_CENTER_CASE              2.433
+score MIXED_ES                       3.000
+score MIXED_FONT_CASE                1.709
+score MIXED_HREF_CASE                1.999
+score MIXED_IMG_CASE                 1.124
+score MONEY_ATM_CARD                 1.958
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               1.239
-score MONEY_FRAUD_3                  0.001
-score MONEY_FRAUD_5                  0.657
-score MONEY_FRAUD_8                  0.785
-score MONEY_FREEMAIL_REPTO           2.996
-score MONEY_FROM_41                  1.997
+score MONEY_FORM_SHORT               1.338
+score MONEY_FRAUD_3                  0.001 # force non-zero
+score MONEY_FRAUD_5                  0.001
+score MONEY_FRAUD_8                  1.155
+score MONEY_FREEMAIL_REPTO           2.999
+score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.671
-score MSGID_WSP_TRAIL                1.062
-score MSMAIL_PRI_ABNORMAL            0.314
-score NAME_EMAIL_DIFF                1.917
-score NA_DOLLARS                     0.829
-score NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.246
-score NOT_SPAM                       3.296
-score NO_FM_NAME_IP_HOSTN            0.288
+score MONEY_NOHTML                   1.913
+score MSGID_WSP_TRAIL                1.915
+score MSMAIL_PRI_ABNORMAL            1.499
+score NAME_EMAIL_DIFF                1.939
+score NA_DOLLARS                     0.215
+score NEW_PRODUCTS                   1.249
+score NICE_REPLY_A                   -1.156
+score NOT_SPAM                       3.199
+score NO_FM_NAME_IP_HOSTN            0.282
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.999
+score NUMBEREND_LINKBAIT             0.595
 score OBFU_TEXT_ATTACH               0.001
-score ODD_FREEM_REPTO                2.996
-score OFFER_ONLY_AMERICA             1.650
-score ONLINE_MKTG_CNSLT              2.596
-score ORDER_TODAY                    1.569
-score PDS_BTC_ID                     0.498
-score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   1.923
-score PDS_DBL_URL_TNB_RUNON          1.997
+score ODD_FREEM_REPTO                3.000
+score OFFER_ONLY_AMERICA             1.430
+score ONLINE_MKTG_CNSLT              2.600
+score ORDER_TODAY                    0.204
+score PDS_BTC_ID                     0.500
+score PDS_BTC_MSGID                  0.001 # force non-zero
+score PDS_BTC_NTLD                   1.825
+score PDS_DBL_URL_TNB_RUNON          1.999
 score PDS_FRNOM_TODOM_DBL_URL        1.499
-score PDS_FRNOM_TODOM_NAKED_TO       1.498
-score PDS_FROM_2_EMAILS_SHRTNER      1.013
-score PDS_FROM_NAME_TO_DOMAIN        1.997
-score PDS_HP_HELO_NORDNS             0.998
-score PDS_OTHER_BAD_TLD              1.997
-score PDS_PHP_EVAL                   1.498
+score PDS_FRNOM_TODOM_NAKED_TO       1.499
+score PDS_FROM_2_EMAILS_SHRTNER      1.401
+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_SHORTFWD_URISHRT_FP        1.499
 score PDS_TINYSUBJ_URISHRT           1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
-score PDS_TO_EQ_FROM_NAME            3.196
-score PHP_ORIG_SCRIPT                2.249
-score PHP_ORIG_SCRIPT_EVAL           2.996
-score PHP_SCRIPT                     2.497
-score PP_MIME_FAKE_ASCII_TEXT        0.998
-score RAND_HEADER_LIST_SPOOF         2.996
-score RAND_MKTG_HEADER               1.997
-score RATWARE_NO_RDNS                1.892
-score RDNS_NUM_TLD_XM                1.628
-score READY_TO_SHIP                  1.248
-score REPLYTO_EMPTY                  2.397
-score REPTO_419_FRAUD                2.938
-score REPTO_419_FRAUD_GM             2.996
-score REPTO_419_FRAUD_GM_LOOSE       0.998
-score RISK_FREE                      3.096
-score SCC_NEWBIE_HASBEENS            1.717
-score SENDGRID_REDIR                 1.498
-score SERGIO_SUBJECT_VIAGRA01        3.095
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_IMG            0.973
-score SHORT_SHORTNER                 1.997
-score STATIC_XPRIO_OLE               1.552
-score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
-score TARINGANET_IMG_NOT_RCVD_TN     1.999
-score THIS_AD                        1.298
-score THIS_IS_ADV_SUSP_NTLD          1.477
-score TO_EQ_FM_DIRECT_MX             0.001 # force non-zero
-score TO_IN_SUBJ                     0.098
-score TO_NO_BRKTS_FROM_MSSP          2.497
-score TO_NO_BRKTS_HTML_IMG           1.997
-score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_NORDNS_HTML        1.997
-score TO_NO_BRKTS_PCNT               2.498
-score TRANSFORM_LIFE                 2.497
-score TVD_PH_BODY_META               3.096
-score TVD_RCVD_SPACE_BRACKET         2.797
-score UNDISC_FREEM                   3.096
-score UNDISC_MONEY                   3.396
-score URI_DEOBFU_INSTR               4.395
-score URI_DOTEDU                     1.997
-score URI_DQ_UNSUB                   2.497
-score URI_FIREBASEAPP                2.996
-score URI_GOOGLE_PROXY               3.096
-score URI_GOOG_STO_SPAMMY            2.996
-score URI_LONG_REPEAT                2.497
-score URI_PHISH                      3.995
-score URI_PHP_REDIR                  3.496
-score URI_TRY_3LD                    1.937
-score URI_WPADMIN                    2.596
-score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                2.516
-score WALMART_IMG_NOT_RCVD_WAL       1.681
-score WANT_TO_ORDER                  2.746
-score WORD_INVIS_MANY                2.399
-score XFER_LOTSA_MONEY               0.741
-score XM_DIGITS_ONLY                 0.551
-score XM_RANDOM                      2.497
-score XM_RECPTID                     2.996
-score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          0.034
-score YOU_INHERIT                    2.514
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
+score PDS_TO_EQ_FROM_NAME            3.200
+score PHP_ORIG_SCRIPT                2.251
+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                0.649
+score RDNS_NUM_TLD_XM                0.322
+score READY_TO_SHIP                  1.249
+score REPLYTO_EMPTY                  2.399
+score REPTO_419_FRAUD                1.936
+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.799
+score SENDGRID_REDIR                 1.499
+score SEO_SUSP_NTLD                  1.199
+score SERGIO_SUBJECT_VIAGRA01        3.932
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
+score SHORTENER_SHORT_IMG            1.587
+score SHORT_SHORTNER                 1.999
+score STATIC_XPRIO_OLE               1.073
+score TAGSTAT_IMG_NOT_RCVD_TGST      1.999
+score TARINGANET_IMG_NOT_RCVD_TN     1.892
+score THIS_AD                        1.299
+score THIS_IS_ADV_SUSP_NTLD          0.001
+score TO_EQ_FM_DIRECT_MX             0.001
+score TO_IN_SUBJ                     0.100
+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        1.999
+score TO_NO_BRKTS_PCNT               2.499
+score TRANSFORM_LIFE                 2.499
+score TVD_PH_BODY_META               2.999
+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.500
+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                      3.999
+score URI_PHP_REDIR                  3.499
+score URI_TRY_3LD                    1.933
+score URI_WPADMIN                    2.599
+score URI_WP_HACKED_2                2.499
+score VFY_ACCT_NORDNS                2.978
+score WALMART_IMG_NOT_RCVD_WAL       2.389
+score WANT_TO_ORDER                  2.749
+score WORD_INVIS_MANY                2.403
+score XFER_LOTSA_MONEY               0.763
+score XM_DIGITS_ONLY                 0.082
+score XM_RANDOM                      2.499
+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
@@ -264,7 +265,6 @@
 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
@@ -291,7 +291,6 @@
 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
@@ -346,7 +345,6 @@
 score REPTO_419_FRAUD_YJ             1.000
 score REPTO_419_FRAUD_YN             1.000
 score SENDGRID_REDIR_PHISH           1.000
-score SEO_SUSP_NTLD                  1.000
 score SHORT_IMG_SUSP_NTLD            1.000
 score SPOOFED_FREEMAIL_NO_RDNS       1.000
 score SPOOF_GMAIL_MID                1.000
@@ -357,7 +355,6 @@
 score TONLINE_FAKE_DKIM              1.000
 score TO_NAME_SUBJ_NO_RDNS           1.000
 score TO_NO_BRKTS_MSFT               1.000
-score TVD_SPACE_ENCODED              1.000
 score TVD_SPACE_RATIO_MINFP          1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index 87dda29..c8be2c4 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -1,260 +1,258 @@
 # Using score set 1 logs for revision 1891766 from:
 # ham-net-darxus.r1891766.log ham-net-ena-week0.r1891766.log ham-net-ena-week1.r1891766.log ham-net-ena-week2.r1891766.log ham-net-ena-week3.r1891766.log ham-net-ena-week4.r1891766.log ham-net-grenier.r1891766.log ham-net-hege.r1891766.log ham-net-jhardin.r1891766.log ham-net-llanga.r1891766.log ham-net-mmiroslaw-mails-ham.r1891766.log ham-net-mmiroslaw-mails-spam.r1891766.log ham-net-pds.r1891766.log ham-net-spamsponge.r1891766.log ham-net-thendrikx.r1891766.log ham-net-tsz-spam-corpus.r1891766.log spam-net-darxus.r1891766.log spam-net-ena-week0.r1891766.log spam-net-ena-week1.r1891766.log spam-net-ena-week2.r1891766.log spam-net-ena-week3.r1891766.log spam-net-ena-week4.r1891766.log spam-net-grenier.r1891766.log spam-net-hege.r1891766.log spam-net-jhardin.r1891766.log spam-net-llanga.r1891766.log spam-net-mmiroslaw-mails-ham.r1891766.log spam-net-mmiroslaw-mails-spam.r1891766.log spam-net-pds.r1891766.log spam-net-spamsponge.r1891766.log spam-net-thendrikx.r1891766.log spam-net-tsz-spam-corpus.r1891766.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.396
-score ADVANCE_FEE_2_NEW_FORM         0.471
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.497
+score AC_FROM_MANY_DOTS              2.999
+score AC_HTML_NONSENSE_TAGS          1.999
+score ADMITS_SPAM                    3.399
+score ADVANCE_FEE_2_NEW_FORM         1.596
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
 score ADVANCE_FEE_2_NEW_MONEY        0.001
-score ADVANCE_FEE_3_NEW              3.407
+score ADVANCE_FEE_3_NEW              3.404
 score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_3_NEW_MONEY        0.982
-score ADVANCE_FEE_4_NEW              2.397
+score ADVANCE_FEE_3_NEW_MONEY        1.001
+score ADVANCE_FEE_4_NEW              2.399
+score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_4_NEW_MONEY        0.001
-score ADVANCE_FEE_5_NEW              2.497
+score ADVANCE_FEE_5_NEW              2.499
 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.163
+score AD_PREFS                       0.500
+score ALIBABA_IMG_NOT_RCVD_ALI       1.461
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         0.205
+score APP_DEVELOPMENT_NORDNS         0.332
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score BIGNUM_EMAILS_FREEM            2.033
-score BITCOIN_MALF_HTML              3.496
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.372
+score BIGNUM_EMAILS_FREEM            1.633
+score BITCOIN_MALF_HTML              3.499
 score BITCOIN_MALWARE                0.001
-score BITCOIN_ONAN                   2.996
-score BITCOIN_SPAM_02                1.326
-score BITCOIN_SPAM_03                1.532
-score BITCOIN_SPAM_05                2.497
-score BITCOIN_SPAM_07                3.089
-score BITCOIN_XPRIO                  0.149
-score BITCOIN_YOUR_INFO              2.308
+score BITCOIN_ONAN                   2.999
+score BITCOIN_SPAM_02                1.185
+score BITCOIN_SPAM_03                2.250
+score BITCOIN_SPAM_05                2.499
+score BITCOIN_SPAM_07                3.255
+score BITCOIN_XPRIO                  0.176
+score BITCOIN_YOUR_INFO              2.314
 score BODY_URI_ONLY                  0.001
-score BOGUS_MIME_VERSION             3.278
+score BOGUS_MIME_VERSION             3.259
 score CK_HELO_GENERIC                0.008
-score CONTENT_AFTER_HTML             2.418
+score CONTENT_AFTER_HTML             2.417
 score CTE_8BIT_MISMATCH              0.001
-score DEAR_BENEFICIARY               2.896
-score DETAILS_OF_PRODUCT             1.248
-score DKIMWL_BL                      2.334
-score DKIMWL_WL_HIGH                 -0.717
+score DEAR_BENEFICIARY               2.799
+score DETAILS_OF_PRODUCT             1.249
+score DKIMWL_BL                      2.320
+score DKIMWL_WL_HIGH                 -0.719
 score DKIMWL_WL_MED                  -0.001
-score DKIMWL_WL_MEDHI                -0.275
-score DX_TEXT_03                     0.698
-score DYNAMIC_IMGUR                  2.851
-score EBAY_IMG_NOT_RCVD_EBAY         1.666
-score ENCRYPTED_MESSAGE              -0.998
-score FACEBOOK_IMG_NOT_RCVD_FB       1.997
-score FAKE_REPLY_A1                  2.642
-score FAKE_REPLY_B                   3.695
-score FILL_THIS_FORM                 0.001 # force non-zero
-score FONT_INVIS_DIRECT              0.001
-score FONT_INVIS_DOTGOV              3.496
-score FONT_INVIS_HTML_NOHTML         2.996
-score FONT_INVIS_MSGID               1.842
-score FONT_INVIS_NORDNS              1.749
-score FORGED_SPF_HELO                1.597
+score DKIMWL_WL_MEDHI                -0.912
+score DX_TEXT_03                     0.700
+score DYNAMIC_IMGUR                  1.922
+score EBAY_IMG_NOT_RCVD_EBAY         0.135
+score ENCRYPTED_MESSAGE              -1.000
+score FACEBOOK_IMG_NOT_RCVD_FB       1.999
+score FAKE_REPLY_A1                  3.660
+score FAKE_REPLY_B                   3.699
+score FILL_THIS_FORM                 0.001
+score FONT_INVIS_DIRECT              0.001 # force non-zero
+score FONT_INVIS_DOTGOV              3.500
+score FONT_INVIS_HTML_NOHTML         2.999
+score FONT_INVIS_MSGID               1.849
+score FONT_INVIS_NORDNS              2.242
+score FORGED_SPF_HELO                1.599
 score FORM_FRAUD                     0.001
-score FORM_FRAUD_3                   2.596
-score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      1.913
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROMSPACE                      2.595
-score FROM_2_EMAILS_SHORT            2.996
-score FROM_BANK_NOAUTH               0.998
-score FROM_FMBLA_NEWDOM              1.498
-score FROM_FMBLA_NEWDOM14            0.998
-score FROM_FMBLA_NEWDOM28            0.798
-score FROM_GOV_DKIM_AU               -0.752
+score FORM_FRAUD_3                   2.599
+score FORM_FRAUD_5                   0.001 # force non-zero
+score FOUND_YOU                      1.349
+score FREEMAIL_FORGED_FROMDOMAIN     0.250
+score FROMSPACE                      2.418
+score FROM_2_EMAILS_SHORT            2.999
+score FROM_BANK_NOAUTH               0.999
+score FROM_FMBLA_NEWDOM              1.499
+score FROM_FMBLA_NEWDOM14            0.999
+score FROM_FMBLA_NEWDOM28            0.799
+score FROM_GOV_DKIM_AU               -0.740
 score FROM_GOV_SPOOF                 0.001
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               2.197
+score FROM_MISSP_DYNIP               2.199
 score FROM_MISSP_EH_MATCH            0.001
 score FROM_MISSP_FREEMAIL            0.001
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.496
+score FROM_MISSP_PHISH               3.499
 score FROM_MISSP_REPLYTO             0.001
 score FROM_MISSP_SPF_FAIL            0.001
-score FROM_MISSP_USER                0.001 # force non-zero
-score FROM_MULTI_NORDNS              2.346
-score FROM_NAME_EQ_TO_G_DRIVE        0.001
-score FROM_NTLD_REPLY_FREEMAIL       1.121
+score FROM_MISSP_USER                0.001
+score FROM_MULTI_NORDNS              0.509
+score FROM_NAME_EQ_TO_G_DRIVE        1.355
+score FROM_NTLD_REPLY_FREEMAIL       0.660
 score FROM_PAYPAL_SPOOF              0.001
 score FROM_SUSPICIOUS_NTLD           0.499
-score FROM_SUSPICIOUS_NTLD_FP        1.099
-score FSL_BULK_SIG                   2.617
+score FROM_SUSPICIOUS_NTLD_FP        1.026
+score FSL_BULK_SIG                   2.622
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  2.896
+score FSL_HELO_FAKE                  2.899
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.197
-score GB_FAKE_RF_SHORT               1.997
-score GB_FREEMAIL_DISPTO             0.498
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
-score GOOGLE_DOC_SUSP                2.996
-score GOOG_REDIR_NORDNS              2.996
-score GOOG_STO_EMAIL_PHISH           2.563
-score GOOG_STO_HTML_PHISH            2.424
-score GOOG_STO_HTML_PHISH_MANY       1.648
-score GOOG_STO_IMG_HTML              2.996
-score GOOG_STO_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       1.025
-score HDRS_LCASE                     0.098
-score HDRS_LCASE_IMGONLY             0.001 # force non-zero
+score FUZZY_AMAZON                   2.199
+score GB_FAKE_RF_SHORT               1.999
+score GB_FREEMAIL_DISPTO             0.499
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.500
+score GOOGLE_DOC_SUSP                2.999
+score GOOG_REDIR_NORDNS              2.999
+score GOOG_STO_EMAIL_PHISH           2.473
+score GOOG_STO_HTML_PHISH            2.112
+score GOOG_STO_HTML_PHISH_MANY       2.856
+score GOOG_STO_IMG_HTML              2.999
+score GOOG_STO_NOIMG_HTML            2.999
+score HAS_X_OUTGOING_SPAM_STAT       0.964
+score HDRS_LCASE_IMGONLY             0.021
 score HDRS_MISSP                     0.001
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
-score HDR_ORDER_FTSDMCXX_NORDNS      0.001 # force non-zero
-score HEADER_FROM_DIFFERENT_DOMAINS  0.248
+score HDR_ORDER_FTSDMCXX_NORDNS      0.001
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
-score HK_NAME_FM_MR_MRS              0.749
-score HK_NAME_MR_MRS                 0.218
-score HK_RANDOM_ENVFROM              0.998
-score HK_RANDOM_FROM                 0.998
-score HK_RANDOM_REPLYTO              0.395
+score HK_NAME_FM_MR_MRS              0.795
+score HK_NAME_MR_MRS                 0.105
+score HK_RANDOM_ENVFROM              0.999
+score HK_RANDOM_FROM                 0.982
+score HK_RANDOM_REPLYTO              0.999
 score HK_SCAM                        0.001
-score HOSTED_IMG_DIRECT_MX           1.988
-score HOSTED_IMG_FREEM               3.496
-score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_OFF_PAGE                  2.663
-score HTML_SINGLET_MANY              0.998
-score HTML_TEXT_INVISIBLE_FONT       0.146
-score HTML_TEXT_INVISIBLE_STYLE      2.084
-score JH_SPAMMY_HEADERS              3.496
-score KHOP_FAKE_EBAY                 1.099
-score KHOP_HELO_FCRDNS               0.398
-score LINKEDIN_IMG_NOT_RCVD_LNKN     2.499
-score LONG_HEX_URI                   0.948
-score LONG_IMG_URI                   0.943
-score LONG_INVISIBLE_TEXT            0.171
+score HOSTED_IMG_DIRECT_MX           3.224
+score HOSTED_IMG_FREEM               3.499
+score HOSTED_IMG_MULTI_PUB_01        2.999
+score HTML_OFF_PAGE                  2.016
+score HTML_SINGLET_MANY              0.976
+score HTML_TEXT_INVISIBLE_FONT       0.424
+score HTML_TEXT_INVISIBLE_STYLE      2.092
+score JH_SPAMMY_HEADERS              3.499
+score KHOP_HELO_FCRDNS               0.399
+score LINKEDIN_IMG_NOT_RCVD_LNKN     2.471
+score LONG_HEX_URI                   0.944
+score LONG_IMG_URI                   0.935
+score LONG_INVISIBLE_TEXT            0.161
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.498
-score MALWARE_NORDNS                 0.352
-score MANY_SPAN_IN_TEXT              2.297
-score MILLION_HUNDRED                2.896
+score LOTTO_AGENT                    1.499
+score MALWARE_NORDNS                 0.510
+score MANY_SPAN_IN_TEXT              2.299
+score MILLION_HUNDRED                2.899
 score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           0.320
-score MIXED_AREA_CASE                0.641
-score MIXED_CENTER_CASE              2.164
-score MIXED_ES                       2.598
-score MIXED_FONT_CASE                1.594
-score MIXED_HREF_CASE                0.606
-score MIXED_IMG_CASE                 1.623
+score MIMEOLE_DIRECT_TO_MX           0.165
+score MIXED_AREA_CASE                1.214
+score MIXED_CENTER_CASE              1.591
+score MIXED_ES                       2.600
+score MIXED_FONT_CASE                0.288
+score MIXED_HREF_CASE                0.456
+score MIXED_IMG_CASE                 1.980
 score MONEY_ATM_CARD                 0.001
 score MONEY_FORM                     0.001
 score MONEY_FORM_SHORT               0.001
 score MONEY_FRAUD_3                  0.001
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.329
-score MONEY_FROM_41                  1.997
+score MONEY_FREEMAIL_REPTO           1.213
+score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   0.948
-score MSGID_WSP_TRAIL                0.675
-score MSMAIL_PRI_ABNORMAL            1.179
-score NAME_EMAIL_DIFF                2.441
-score NA_DOLLARS                     0.538
-score NEW_PRODUCTS                   1.248
-score NICE_REPLY_A                   -0.125
-score NOT_SPAM                       3.096
-score NO_FM_NAME_IP_HOSTN            0.491
-score NSL_RCVD_FROM_USER             0.001 # force non-zero
+score MONEY_NOHTML                   1.169
+score MSGID_WSP_TRAIL                0.555
+score MSMAIL_PRI_ABNORMAL            0.517
+score NAME_EMAIL_DIFF                2.445
+score NA_DOLLARS                     0.174
+score NEW_PRODUCTS                   1.249
+score NICE_REPLY_A                   -0.202
+score NOT_SPAM                       2.999
+score NO_FM_NAME_IP_HOSTN            0.492
+score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.575
-score ODD_FREEM_REPTO                2.448
-score ONLINE_MKTG_CNSLT              2.397
-score ORDER_TODAY                    1.240
-score PDS_BTC_ID                     0.498
+score NUMBEREND_LINKBAIT             0.555
+score ODD_FREEM_REPTO                2.797
+score ONLINE_MKTG_CNSLT              2.399
+score ORDER_TODAY                    0.767
+score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.001
-score PDS_BTC_NTLD                   1.220
-score PDS_FRNOM_TODOM_DBL_URL        1.498
-score PDS_FRNOM_TODOM_NAKED_TO       1.498
-score PDS_FROM_2_EMAILS_SHRTNER      1.498
-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_BTC_NTLD                   1.028
+score PDS_FRNOM_TODOM_DBL_URL        1.499
+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.216
-score PDS_TINYSUBJ_URISHRT           1.498
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.594
-score PDS_TO_EQ_FROM_NAME            2.590
-score PHP_ORIG_SCRIPT                0.585
-score PHP_ORIG_SCRIPT_EVAL           2.996
-score PHP_SCRIPT                     2.265
-score PP_MIME_FAKE_ASCII_TEXT        0.998
-score RAND_HEADER_LIST_SPOOF         2.996
-score RAND_MKTG_HEADER               1.997
-score RATWARE_NO_RDNS                1.647
-score RCVD_IN_MSPIKE_H2              -0.001
-score RDNS_NUM_TLD_XM                1.887
-score READY_TO_SHIP                  1.248
-score REPTO_419_FRAUD                2.999
-score REPTO_419_FRAUD_GM             2.715
-score REPTO_419_FRAUD_GM_LOOSE       0.998
-score RISK_FREE                      2.896
-score SCC_NEWBIE_HASBEENS            1.044
-score SENDGRID_REDIR                 1.098
-score SERGIO_SUBJECT_VIAGRA01        4.095
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_IMG            1.221
-score SHORT_SHORTNER                 0.676
-score SINGLETS_LOW_CONTRAST          2.718
-score SPOOFED_FREEMAIL               1.224
+score PDS_SHORTFWD_URISHRT_FP        1.334
+score PDS_TINYSUBJ_URISHRT           1.499
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.596
+score PDS_TO_EQ_FROM_NAME            3.099
+score PHP_ORIG_SCRIPT                0.590
+score PHP_ORIG_SCRIPT_EVAL           3.000
+score PHP_SCRIPT                     2.332
+score PP_MIME_FAKE_ASCII_TEXT        1.000
+score RAND_HEADER_LIST_SPOOF         3.000
+score RAND_MKTG_HEADER               1.999
+score RATWARE_NO_RDNS                2.124
+score RCVD_IN_MSPIKE_H2              -0.001 # force non-zero
+score RDNS_NUM_TLD_XM                0.468
+score READY_TO_SHIP                  1.249
+score REPTO_419_FRAUD                2.760
+score REPTO_419_FRAUD_GM             2.999
+score REPTO_419_FRAUD_GM_LOOSE       0.999
+score RISK_FREE                      2.899
+score SCC_NEWBIE_HASBEENS            0.916
+score SENDGRID_REDIR                 1.355
+score SERGIO_SUBJECT_VIAGRA01        4.099
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
+score SHORTENER_SHORT_IMG            2.118
+score SHORT_SHORTNER                 0.696
+score SINGLETS_LOW_CONTRAST          3.299
+score SPOOFED_FREEMAIL               1.226
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            0.001
-score SPOOFED_FREEM_REPTO_CHN        0.646
-score SPOOF_GMAIL_MID                1.498
-score STATIC_XPRIO_OLE               1.997
-score TAGSTAT_IMG_NOT_RCVD_TGST      1.997
+score SPOOFED_FREEM_REPTO_CHN        1.693
+score SPOOF_GMAIL_MID                1.499
+score STATIC_XPRIO_OLE               1.999
+score TAGSTAT_IMG_NOT_RCVD_TGST      1.999
 score THIS_AD                        0.999
-score TO_EQ_FM_DIRECT_MX             2.497
-score TO_EQ_FM_DOM_HTML_ONLY         2.696
+score TO_EQ_FM_DIRECT_MX             2.499
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
-score TO_EQ_FM_HTML_ONLY             1.514
+score TO_EQ_FM_HTML_ONLY             2.299
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.128
+score TO_IN_SUBJ                     0.099
+score TO_NAME_SUBJ_NO_RDNS           2.539
 score TO_NO_BRKTS_FROM_MSSP          0.001
-score TO_NO_BRKTS_HTML_IMG           0.078
-score TO_NO_BRKTS_HTML_ONLY          1.997
+score TO_NO_BRKTS_HTML_IMG           0.051
+score TO_NO_BRKTS_HTML_ONLY          1.999
 score TO_NO_BRKTS_MSFT               0.001
 score TO_NO_BRKTS_NORDNS_HTML        1.205
-score TO_NO_BRKTS_PCNT               2.497
-score TRANSFORM_LIFE                 2.497
-score TVD_PH_BODY_META               2.796
-score TVD_RCVD_SPACE_BRACKET         1.087
-score TVD_SPACE_ENCODED              0.001
+score TO_NO_BRKTS_PCNT               2.499
+score TRANSFORM_LIFE                 2.499
+score TVD_PH_BODY_META               2.799
+score TVD_RCVD_SPACE_BRACKET         1.836
 score TVD_SPACE_RATIO_MINFP          0.001
-score UNDISC_FREEM                   2.696
-score UNDISC_MONEY                   3.096
-score URI_DEOBFU_INSTR               4.195
-score URI_DOTEDU                     1.773
-score URI_DQ_UNSUB                   1.896
-score URI_FIREBASEAPP                2.996
-score URI_GOOGLE_PROXY               2.596
-score URI_GOOG_STO_SPAMMY            2.996
-score URI_LONG_REPEAT                2.351
+score UNDISC_FREEM                   2.699
+score UNDISC_MONEY                   3.100
+score URI_DEOBFU_INSTR               4.199
+score URI_DOTEDU                     1.955
+score URI_DQ_UNSUB                   2.059
+score URI_FIREBASEAPP                2.999
+score URI_GOOGLE_PROXY               2.599
+score URI_GOOG_STO_SPAMMY            2.999
+score URI_LONG_REPEAT                2.400
 score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      3.334
-score URI_PHP_REDIR                  3.496
-score URI_TRY_3LD                    1.997
-score URI_WPADMIN                    2.397
-score URI_WP_HACKED                  0.040
-score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                2.061
-score WALMART_IMG_NOT_RCVD_WAL       2.464
-score WANT_TO_ORDER                  2.225
-score WORD_INVIS_MANY                2.996
-score XFER_LOTSA_MONEY               0.998
+score URI_PHISH                      3.313
+score URI_PHP_REDIR                  3.499
+score URI_TRY_3LD                    1.999
+score URI_WPADMIN                    2.399
+score URI_WP_HACKED                  0.056
+score URI_WP_HACKED_2                2.500
+score VFY_ACCT_NORDNS                2.064
+score WALMART_IMG_NOT_RCVD_WAL       0.656
+score WANT_TO_ORDER                  2.243
+score WORD_INVIS_MANY                2.999
+score XFER_LOTSA_MONEY               0.999
 score XM_DIGITS_ONLY                 0.001
-score XM_RANDOM                      0.947
-score XM_RECPTID                     2.996
-score XPRIO_URL_SHORTNER             0.998
-score YOUR_DELIVERY_ADDRESS          0.290
-score YOU_INHERIT                    1.060
+score XM_RANDOM                      0.939
+score XM_RECPTID                     2.999
+score XPRIO_URL_SHORTNER             0.999
+score YOUR_DELIVERY_ADDRESS          0.315
+score YOU_INHERIT                    1.055
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -291,7 +289,6 @@
 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
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 8664635..f797f81 100644
--- a/rulesrc/scores/stats-set0
+++ b/rulesrc/scores/stats-set0
@@ -1,23 +1,23 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 225684  36.744%  (99.726% of non-spam corpus)
-# Correctly spam:     294299  47.915%  (75.868% of spam corpus)
-# False positives:       620  0.101%  (0.274% of nonspam,  34657 weighted)
-# False negatives:     93609  15.241%  (24.132% of spam, 151510 weighted)
-# Average score for spam:  11.2    nonspam: 0.6
-# Average for false-pos:   6.5  false-neg: 1.6
-# TOTAL:              614212  100.00%
+# Correctly non-spam: 225594  36.729%  (99.686% of non-spam corpus)
+# Correctly spam:     295655  48.136%  (76.218% of spam corpus)
+# False positives:       710  0.116%  (0.314% of nonspam,  38513 weighted)
+# False negatives:     92252  15.020%  (23.782% of spam, 144908 weighted)
+# Average score for spam:  11.6    nonspam: 0.6
+# Average for false-pos:   6.3  false-neg: 1.6
+# TOTAL:              614211  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  28263  99.75%
-# Correctly spam:      36825  76.18%
-# False positives:        72  0.25%
-# False negatives:     11515  23.82%
-# TCR(l=50): 3.198148  SpamRecall: 76.179%  SpamPrec: 99.805%
+# Correctly non-spam:  28253  99.71%
+# Correctly spam:      36929  76.39%
+# False positives:        82  0.29%
+# False negatives:     11411  23.61%
+# TCR(l=50): 3.116498  SpamRecall: 76.394%  SpamPrec: 99.778%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam: 216442  95.64%
-# Correctly spam:     213331  55.00%
+# Correctly spam:     213193  54.96%
 # False positives:      9862  4.36%
-# False negatives:    174577  45.00%
-# TCR(l=50): 0.580982  SpamRecall: 54.995%  SpamPrec: 95.581%
+# False negatives:    174714  45.04%
+# TCR(l=50): 0.580861  SpamRecall: 54.960%  SpamPrec: 95.579%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam:  27107  95.67%
-# Correctly spam:      26632  55.09%
+# Correctly spam:      26720  55.28%
 # False positives:      1228  4.33%
-# False negatives:     21708  44.91%
-# TCR(l=50): 0.581653  SpamRecall: 55.093%  SpamPrec: 95.592%
+# False negatives:     21620  44.72%
+# TCR(l=50): 0.582269  SpamRecall: 55.275%  SpamPrec: 95.606%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index b609adf..63b0896 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: 236661  37.406%  (99.593% of non-spam corpus)
-# Correctly spam:     353522  55.876%  (89.486% of spam corpus)
-# False positives:       968  0.153%  (0.407% of nonspam, 115166 weighted)
-# False negatives:     41536  6.565%  (10.514% of spam,  77806 weighted)
-# Average score for spam:  17.2    nonspam: -0.7
-# Average for false-pos:   7.2  false-neg: 1.9
+# Correctly non-spam: 236625  37.400%  (99.577% of non-spam corpus)
+# Correctly spam:     353578  55.885%  (89.500% of spam corpus)
+# False positives:      1004  0.159%  (0.423% of nonspam, 118268 weighted)
+# False negatives:     41480  6.556%  (10.500% of spam,  77324 weighted)
+# Average score for spam:  16.9    nonspam: -0.7
+# Average for false-pos:   7.1  false-neg: 1.9
 # TOTAL:              632687  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  29603  99.61%
-# Correctly spam:      44179  89.63%
-# False positives:       117  0.39%
-# False negatives:      5109  10.37%
-# TCR(l=50): 4.497491  SpamRecall: 89.634%  SpamPrec: 99.736%
+# Correctly non-spam:  29592  99.57%
+# Correctly spam:      44208  89.70%
+# False positives:       128  0.43%
+# False negatives:      5079  10.30%
+# TCR(l=50): 4.293667  SpamRecall: 89.695%  SpamPrec: 99.711%
 
 ##### 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:     274419  69.46%
+# Correctly spam:     274261  69.42%
 # False positives:       754  0.32%
-# False negatives:    120639  30.54%
-# TCR(l=50): 2.495014  SpamRecall: 69.463%  SpamPrec: 99.726%
+# False negatives:    120797  30.58%
+# TCR(l=50): 2.492527  SpamRecall: 69.423%  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:      34212  69.41%
+# Correctly spam:      34268  69.53%
 # False positives:        93  0.31%
-# False negatives:     15076  30.59%
-# TCR(l=50): 2.498631  SpamRecall: 69.412%  SpamPrec: 99.729%
+# False negatives:     15019  30.47%
+# TCR(l=50): 2.505821  SpamRecall: 69.527%  SpamPrec: 99.729%