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

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1916377 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index 59ecb12..15b7e1e 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,9 +1,9 @@
-score ACCT_PHISHING_MANY                    2.999 2.998 2.999 2.998
+score ACCT_PHISHING_MANY                    2.500 2.999 2.500 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.499 2.499 2.499 2.499
-score AC_HTML_NONSENSE_TAGS                 1.999 2.000 1.999 2.000
-score AC_POST_EXTRAS                        0.001 0.819 0.001 0.819
+score AC_HTML_NONSENSE_TAGS                 1.999 1.999 1.999 1.999
+score AC_POST_EXTRAS                        0.001 0.815 0.001 0.815
 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
 score AC_SPAMMY_URI_PATTERNS11              1.000 1.000 1.000 1.000
@@ -13,60 +13,62 @@
 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.099 3.099 3.099 3.099
+score ADMITS_SPAM                           3.200 3.099 3.200 3.099
 score ADULT_DATING_COMPANY                  10.000 10.000 10.000 10.000
 score ADVANCE_FEE_2_NEW_FORM                1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY             0.279 2.300 0.279 2.300
+score ADVANCE_FEE_2_NEW_FRM_MNY             0.299 2.448 0.299 2.448
 score ADVANCE_FEE_2_NEW_MONEY               1.999 1.999 1.999 1.999
-score ADVANCE_FEE_3_NEW                     3.500 3.259 3.500 3.259
-score ADVANCE_FEE_3_NEW_FRM_MNY             0.966 1.193 0.966 1.193
+score ADVANCE_FEE_3_NEW                     3.499 3.267 3.499 3.267
+score ADVANCE_FEE_3_NEW_FRM_MNY             2.448 1.620 2.448 1.620
 score ADVANCE_FEE_3_NEW_MONEY               0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW                     2.135 0.001 2.135 0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY             0.228 2.499 0.228 2.499
+score ADVANCE_FEE_4_NEW                     2.498 0.001 2.498 0.001
+score ADVANCE_FEE_4_NEW_FRM_MNY             1.925 0.250 1.925 0.250
 score ADVANCE_FEE_4_NEW_MONEY               0.001 0.001 0.001 0.001
 score ADVANCE_FEE_5_NEW_FRM_MNY             0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW_MONEY               1.567 0.604 1.567 0.604
-score AD_PREFS                              0.001 0.331 0.001 0.331
+score ADVANCE_FEE_5_NEW_MONEY               0.500 0.745 0.500 0.745
+score AD_PREFS                              0.297 0.429 0.297 0.429
 score ALIBABA_IMG_NOT_RCVD_ALI              1.000 1.000 1.000 1.000
 score AMAZON_IMG_NOT_RCVD_AMZN              2.499 2.499 2.499 2.499
 score APOSTROPHE_TOCC                       0.999 0.999 0.999 0.999
 score APP_DEVELOPMENT_FREEM                 1.000 1.000 1.000 1.000
 score APP_DEVELOPMENT_NORDNS                1.000 1.000 1.000 1.000
+score ARC_SIGNED                            0.001 0.001 0.001 0.001
+score ARC_VALID                             0.001 0.001 0.001 0.001
 score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
-score AXB_X_FF_SEZ_S                        3.199 3.199 3.199 3.199
+score AXB_X_FF_SEZ_S                        3.299 3.199 3.299 3.199
 score BEBEE_IMG_NOT_RCVD_BB                 1.000 1.000 1.000 1.000
 score BIGNUM_EMAILS_FREEM                   0.001 0.001 0.001 0.001
 score BIGNUM_EMAILS_MANY                    1.000 1.000 1.000 1.000
 score BITCOIN_BOMB                          1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE                      2.629 1.884 2.629 1.884
-score BITCOIN_EXTORT_01                     2.104 2.002 2.104 2.002
+score BITCOIN_DEADLINE                      2.461 1.796 2.461 1.796
+score BITCOIN_EXTORT_01                     2.105 2.004 2.105 2.004
 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_MALWARE                       2.940 2.429 2.940 2.429
+score BITCOIN_MALWARE                       3.281 3.045 3.281 3.045
 score BITCOIN_OBFU_SUBJ                     1.000 1.000 1.000 1.000
-score BITCOIN_ONAN                          2.813 2.079 2.813 2.079
+score BITCOIN_ONAN                          1.847 2.830 1.847 2.830
 score BITCOIN_PAY_ME                        1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_01                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_02                       2.499 1.051 2.499 1.051
-score BITCOIN_SPAM_03                       2.499 2.500 2.499 2.500
+score BITCOIN_SPAM_02                       2.499 0.220 2.499 0.220
+score BITCOIN_SPAM_03                       2.500 2.499 2.500 2.499
 score BITCOIN_SPAM_04                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_05                       0.001 1.571 0.001 1.571
+score BITCOIN_SPAM_05                       0.001 1.200 0.001 1.200
 score BITCOIN_SPAM_06                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07                       3.499 2.134 3.499 2.134
+score BITCOIN_SPAM_07                       2.108 3.200 2.108 3.200
 score BITCOIN_SPAM_08                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_09                       1.499 1.499 1.499 1.499
+score BITCOIN_SPAM_09                       1.499 1.500 1.499 1.500
 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_TOEQFM                        0.001 0.001 0.001 0.001
-score BITCOIN_VISTA                         0.001 2.429 0.001 2.429
+score BITCOIN_VISTA                         0.001 2.571 0.001 2.571
 score BITCOIN_XPRIO                         2.499 2.499 2.499 2.499
 score BITCOIN_YOUR_INFO                     2.999 2.999 2.999 2.999
-score BODY_SINGLE_URI                       2.499 0.298 2.499 0.298
-score BODY_URI_ONLY                         1.851 0.704 1.851 0.704
-score BOGUS_MIME_VERSION                    3.500 2.365 3.500 2.365
-score BOGUS_MSM_HDRS                        2.088 1.745 2.088 1.745
+score BODY_SINGLE_URI                       2.499 0.292 2.499 0.292
+score BODY_URI_ONLY                         2.999 0.703 2.999 0.703
+score BOGUS_MIME_VERSION                    3.499 1.297 3.499 1.297
+score BOGUS_MSM_HDRS                        0.108 0.044 0.108 0.044
 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
@@ -78,36 +80,35 @@
 score CONTENT_AFTER_HTML                    1.000 1.000 1.000 1.000
 score CONTENT_AFTER_HTML_WEAK               1.000 1.000 1.000 1.000
 score CTE_8BIT_MISMATCH                     0.999 0.001 0.999 0.001
-score DATE_IN_FUTURE_Q_PLUS                 3.899 3.014 3.899 3.014
+score DATE_IN_FUTURE_Q_PLUS                 3.799 3.360 3.799 3.360
 score DAY_I_EARNED                          1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY                      3.299 3.299 3.299 3.299
+score DEAR_BENEFICIARY                      3.399 3.299 3.399 3.299
 score DKIMWL_BL                             0.001 1.000 0.001 1.000
 score DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH                        0.001 -0.316 0.001 -0.316
+score DKIMWL_WL_HIGH                        0.001 -0.374 0.001 -0.374
 score DKIMWL_WL_MED                         0.001 -0.001 0.001 -0.001
 score DKIMWL_WL_MEDHI                       0.001 -0.001 0.001 -0.001
 score DOTGOV_IMAGE                          1.000 1.000 1.000 1.000
 score DSN_NO_MIMEVERSION                    1.999 1.999 1.999 1.999
 score DYNAMIC_IMGUR                         1.000 1.000 1.000 1.000
 score EBAY_IMG_NOT_RCVD_EBAY                1.000 1.000 1.000 1.000
-score ENCRYPTED_MESSAGE                     -1.000 -0.999 -1.000 -0.999
+score ENCRYPTED_MESSAGE                     -0.999 -0.999 -0.999 -0.999
 score END_FUTURE_EMAILS                     2.499 2.499 2.499 2.499
 score ENVFROM_GOOG_TRIX                     1.000 1.000 1.000 1.000
-score FACEBOOK_IMG_NOT_RCVD_FB              1.999 1.999 1.999 1.999
-score FBI_MONEY                             1.712 0.832 1.712 0.832
-score FBI_SPOOF                             1.883 1.999 1.883 1.999
-score FILL_THIS_FORM                        0.486 0.001 0.486 0.001
+score FACEBOOK_IMG_NOT_RCVD_FB              1.999 2.000 1.999 2.000
+score FBI_MONEY                             0.251 1.131 0.251 1.131
+score FBI_SPOOF                             1.393 1.999 1.393 1.999
+score FILL_THIS_FORM                        0.487 0.001 0.487 0.001
 score FONT_INVIS_DIRECT                     0.001 0.001 0.001 0.001
 score FONT_INVIS_DOTGOV                     1.000 1.000 1.000 1.000
 score FONT_INVIS_HTML_NOHTML                1.000 1.000 1.000 1.000
 score FONT_INVIS_LONG_LINE                  2.999 2.999 2.999 2.999
-score FONT_INVIS_MSGID                      2.499 2.500 2.499 2.500
+score FONT_INVIS_MSGID                      2.499 2.499 2.499 2.499
 score FONT_INVIS_NORDNS                     0.001 1.236 0.001 1.236
-score FONT_INVIS_POSTEXTRAS                 2.655 2.971 2.655 2.971
-score FORGED_SPF_HELO                       0.001 1.900 0.001 1.900
+score FONT_INVIS_POSTEXTRAS                 2.652 2.976 2.652 2.976
 score FORM_FRAUD                            0.999 0.999 0.999 0.999
-score FORM_FRAUD_3                          2.030 0.412 2.030 0.412
-score FORM_FRAUD_5                          3.050 3.111 3.050 3.111
+score FORM_FRAUD_3                          1.474 1.874 1.474 1.874
+score FORM_FRAUD_5                          3.699 2.920 3.699 2.920
 score FOUND_YOU                             3.249 3.249 3.249 3.249
 score FREEMAIL_FORGED_FROMDOMAIN            0.001 0.001 0.001 0.001
 score FREEM_FRNUM_UNICD_EMPTY               1.000 1.000 1.000 1.000
@@ -116,85 +117,85 @@
 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.499 0.001 1.499
-score FROM_FMBLA_NEWDOM14                   0.001 0.999 0.001 0.999
-score FROM_FMBLA_NEWDOM28                   0.001 0.800 0.001 0.800
-score FROM_GOV_DKIM_AU                      0.001 -0.346 0.001 -0.346
+score FROM_FMBLA_NEWDOM14                   0.001 1.000 0.001 1.000
+score FROM_FMBLA_NEWDOM28                   0.001 0.799 0.001 0.799
+score FROM_GOV_DKIM_AU                      0.001 -0.999 0.001 -0.999
 score FROM_GOV_REPLYTO_FREEMAIL             0.001 1.000 0.001 1.000
 score FROM_GOV_SPOOF                        0.001 1.000 0.001 1.000
-score FROM_IN_TO_AND_SUBJ                   2.199 1.790 2.199 1.790
-score FROM_MISSPACED                        2.000 0.001 2.000 0.001
-score FROM_MISSP_DYNIP                      1.660 0.584 1.660 0.584
-score FROM_MISSP_EH_MATCH                   1.999 0.765 1.999 0.765
+score FROM_IN_TO_AND_SUBJ                   2.199 1.602 2.199 1.602
+score FROM_MISSPACED                        1.999 0.001 1.999 0.001
+score FROM_MISSP_DYNIP                      1.658 0.540 1.658 0.540
+score FROM_MISSP_EH_MATCH                   1.690 0.772 1.690 0.772
 score FROM_MISSP_FREEMAIL                   3.599 3.499 3.599 3.499
 score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
-score FROM_MISSP_PHISH                      3.499 0.043 3.499 0.043
-score FROM_MISSP_REPLYTO                    2.500 0.808 2.500 0.808
-score FROM_MISSP_SPF_FAIL                   0.001 1.250 0.001 1.250
-score FROM_MISSP_TO_UNDISC                  0.986 1.464 0.986 1.464
+score FROM_MISSP_PHISH                      2.179 1.376 2.179 1.376
+score FROM_MISSP_REPLYTO                    2.499 0.853 2.499 0.853
+score FROM_MISSP_SPF_FAIL                   0.001 1.074 0.001 1.074
+score FROM_MISSP_TO_UNDISC                  1.376 2.007 1.376 2.007
 score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
 score FROM_MISSP_XPRIO                      2.499 2.499 2.499 2.499
 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.485 0.260 1.485 0.260
+score FROM_NTLD_REPLY_FREEMAIL              1.736 0.813 1.736 0.813
 score FROM_NUMBERO_NEWDOMAIN                0.001 1.000 0.001 1.000
 score FROM_PAYPAL_SPOOF                     0.001 1.599 0.001 1.599
-score FROM_SUSPICIOUS_NTLD                  0.500 0.499 0.500 0.499
+score FROM_SUSPICIOUS_NTLD                  0.499 0.499 0.499 0.499
 score FROM_SUSPICIOUS_NTLD_FP               1.999 1.999 1.999 1.999
-score FROM_UNBAL2                           2.399 2.299 2.399 2.299
-score FROM_WSP_TRAIL                        1.402 0.456 1.402 0.456
+score FROM_UNBAL2                           2.299 2.299 2.299 2.299
+score FROM_WSP_TRAIL                        1.503 0.456 1.503 0.456
 score FSL_BULK_SIG                          0.001 0.001 0.001 0.001
 score FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
 score FSL_NEW_HELO_USER                     0.001 0.001 0.001 0.001
 score FUZZY_AMAZON                          2.399 2.399 2.399 2.399
-score FUZZY_CLICK_HERE                      3.399 3.299 3.399 3.299
-score FUZZY_IMPORTANT                       0.931 2.130 0.931 2.130
-score FUZZY_PRIVACY                         2.699 2.600 2.699 2.600
+score FUZZY_CLICK_HERE                      3.400 3.299 3.400 3.299
+score FUZZY_IMPORTANT                       0.730 2.135 0.730 2.135
+score FUZZY_PRIVACY                         2.699 2.599 2.699 2.599
 score FUZZY_SECURITY                        2.899 2.799 2.899 2.799
-score FUZZY_WALLET                          1.799 0.252 1.799 0.252
+score FUZZY_WALLET                          1.799 0.257 1.799 0.257
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
 score GB_BITCOIN_CP                         2.999 2.999 2.999 2.999
-score GB_CUSTOM_HTM_URI                     1.500 0.001 1.500 0.001
-score GB_FAKE_RF_SHORT                      1.941 1.999 1.941 1.999
+score GB_CUSTOM_HTM_URI                     1.040 0.001 1.040 0.001
+score GB_FAKE_RF_SHORT                      1.940 1.999 1.940 1.999
 score GB_FORGED_MUA_POSTFIX                 1.000 1.000 1.000 1.000
 score GB_FREEMAIL_DISPTO                    0.001 0.001 0.001 0.001
 score GB_FREEMAIL_DISPTO_NOTFREEM           0.500 0.500 0.500 0.500
 score GB_GOOGLE_OBFUR                       0.750 0.750 0.750 0.750
-score GB_HASHBL_BTC                         0.001 4.816 0.001 4.816
+score GB_HASHBL_BTC                         0.001 4.532 0.001 4.532
 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                       1.000 1.000 1.000 1.000
 score GOOGLE_DRIVE_REPLY_BAD_NTLD           1.000 1.000 1.000 1.000
-score GOOG_MALWARE_DNLD                     3.887 3.498 3.887 3.498
-score GOOG_REDIR_HTML_ONLY                  2.000 1.999 2.000 1.999
+score GOOG_MALWARE_DNLD                     4.894 3.495 4.894 3.495
+score GOOG_REDIR_HTML_ONLY                  1.999 1.999 1.999 1.999
 score GOOG_REDIR_NORDNS                     2.500 0.001 2.500 0.001
 score GOOG_STO_EMAIL_PHISH                  1.000 1.000 1.000 1.000
 score GOOG_STO_HTML_PHISH                   1.000 1.000 1.000 1.000
 score GOOG_STO_HTML_PHISH_MANY              1.000 1.000 1.000 1.000
-score GOOG_STO_IMG_HTML                     2.500 2.027 2.500 2.027
+score GOOG_STO_IMG_HTML                     2.504 2.024 2.504 2.024
 score GOOG_STO_IMG_NOHTML                   1.000 1.000 1.000 1.000
-score GOOG_STO_NOIMG_HTML                   2.604 2.999 2.604 2.999
+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.000 1.000 1.000 1.000
-score HDRS_LCASE_IMGONLY                    0.100 0.100 0.100 0.100
-score HDRS_MISSP                            2.149 2.500 2.149 2.500
+score HDRS_LCASE_IMGONLY                    0.099 0.100 0.099 0.100
+score HDRS_MISSP                            2.150 2.499 2.150 2.499
 score HDR_ORDER_FTSDMCXX_DIRECT             1.999 1.999 1.999 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS             2.052 3.499 2.052 3.499
-score HEADER_FROM_DIFFERENT_DOMAINS         0.249 0.249 0.249 0.249
-score HELO_NO_DOMAIN                        0.001 0.937 0.001 0.937
+score HDR_ORDER_FTSDMCXX_NORDNS             2.188 3.499 2.188 3.499
+score HEADER_FROM_DIFFERENT_DOMAINS         0.250 0.250 0.250 0.250
+score HELO_NO_DOMAIN                        0.001 1.296 0.001 1.296
 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_LOTTO                              0.999 0.999 0.999 0.999
-score HK_NAME_FM_MR_MRS                     1.315 0.911 1.315 0.911
-score HK_NAME_MR_MRS                        0.999 1.000 0.999 1.000
+score HK_LOTTO                              1.000 0.999 1.000 0.999
+score HK_NAME_FM_MR_MRS                     1.231 0.900 1.231 0.900
+score HK_NAME_MR_MRS                        0.999 0.999 0.999 0.999
 score HK_RANDOM_ENVFROM                     0.999 0.001 0.999 0.001
 score HK_RANDOM_FROM                        0.999 0.999 0.999 0.999
-score HK_RANDOM_REPLYTO                     1.000 0.999 1.000 0.999
+score HK_RANDOM_REPLYTO                     1.000 1.000 1.000 1.000
 score HK_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
-score HK_SCAM                               1.319 1.999 1.319 1.999
-score HK_WIN                                0.001 0.558 0.001 0.558
-score HOSTED_IMG_DIRECT_MX                  3.499 2.729 3.499 2.729
+score HK_SCAM                               0.100 1.999 0.100 1.999
+score HK_WIN                                0.485 0.640 0.485 0.640
+score HOSTED_IMG_DIRECT_MX                  3.499 2.329 3.499 2.329
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM                      1.362 1.046 1.362 1.046
+score HOSTED_IMG_FREEM                      1.387 1.049 1.387 1.049
 score HOSTED_IMG_MULTI                      1.000 1.000 1.000 1.000
 score HOSTED_IMG_MULTI_PUB_01               2.999 2.999 2.999 2.999
 score HREF_EMPTY_NORDNS                     0.001 0.001 0.001 0.001
@@ -205,38 +206,37 @@
 score HTML_ENTITY_ASCII                     2.999 2.999 2.999 2.999
 score HTML_ENTITY_ASCII_TINY                1.000 1.000 1.000 1.000
 score HTML_FONT_TINY_NORDNS                 1.999 0.001 1.999 0.001
-score HTML_OFF_PAGE                         2.999 2.366 2.999 2.366
+score HTML_OFF_PAGE                         2.999 2.634 2.999 2.634
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY                     2.499 2.369 2.499 2.369
-score HTML_TAG_BALANCE_CENTER               3.200 3.099 3.200 3.099
-score HTML_TEXT_INVISIBLE_FONT              1.192 0.053 1.192 0.053
-score HTML_TEXT_INVISIBLE_STYLE             0.503 1.067 0.503 1.067
+score HTML_SINGLET_MANY                     2.499 2.360 2.499 2.360
+score HTML_TAG_BALANCE_CENTER               3.099 3.099 3.099 3.099
+score HTML_TEXT_INVISIBLE_FONT              1.351 0.050 1.351 0.050
+score HTML_TEXT_INVISIBLE_STYLE             0.495 1.071 0.495 1.071
 score IMG_ONLY_FM_DOM_INFO                  2.499 2.499 2.499 2.499
 score JH_SPAMMY_HEADERS                     1.000 1.000 1.000 1.000
 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.001 0.400 0.001
+score KHOP_HELO_FCRDNS                      0.399 0.001 0.399 0.001
 score LINKEDIN_IMG_NOT_RCVD_LNKN            1.000 1.000 1.000 1.000
-score LIST_PARTIAL_SHORT_MSG                2.500 1.538 2.500 1.538
+score LIST_PARTIAL_SHORT_MSG                2.499 1.554 2.499 1.554
 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 LONGLN_LOW_CONTRAST                   2.499 0.001 2.499 0.001
-score LONG_HEX_URI                          2.999 2.151 2.999 2.151
-score LONG_IMG_URI                          1.320 1.105 1.320 1.105
-score LONG_INVISIBLE_TEXT                   1.782 2.096 1.782 2.096
-score LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
+score LONG_HEX_URI                          2.999 2.167 2.999 2.167
+score LONG_IMG_URI                          1.322 1.099 1.322 1.099
+score LONG_INVISIBLE_TEXT                   1.785 2.096 1.785 2.096
+score LOTS_OF_MONEY                         0.009 0.010 0.009 0.010
 score LOTTO_AGENT                           0.001 0.001 0.001 0.001
 score LOTTO_DEPT                            1.999 1.999 1.999 1.999
 score LUCRATIVE                             1.000 1.000 1.000 1.000
-score MALFORMED_FREEMAIL                    1.713 1.333 1.713 1.333
+score MALFORMED_FREEMAIL                    1.639 1.330 1.639 1.330
 score MALF_HTML_B64                         1.000 1.000 1.000 1.000
-score MALWARE_NORDNS                        2.045 1.530 2.045 1.530
+score MALWARE_NORDNS                        1.034 1.963 1.034 1.963
 score MALWARE_PASSWORD                      1.000 1.000 1.000 1.000
-score MANY_SUBDOM                           3.099 3.099 3.099 3.099
-score MAY_BE_FORGED                         1.999 2.199 1.999 2.199
+score MANY_SUBDOM                           3.199 3.100 3.199 3.100
 score MILLION_HUNDRED                       0.001 0.001 0.001 0.001
-score MILLION_USD                           1.470 1.590 1.470 1.590
-score MIMEOLE_DIRECT_TO_MX                  1.999 0.911 1.999 0.911
+score MILLION_USD                           0.592 1.590 0.592 1.590
+score MIMEOLE_DIRECT_TO_MX                  1.999 0.855 1.999 0.855
 score MIME_NO_TEXT                          1.999 1.999 1.999 1.999
 score MIXED_AREA_CASE                       1.000 1.000 1.000 1.000
 score MIXED_CENTER_CASE                     1.000 1.000 1.000 1.000
@@ -250,47 +250,46 @@
 score MONERO_PAY_ME                         1.000 1.000 1.000 1.000
 score MONEY_ATM_CARD                        0.001 0.001 0.001 0.001
 score MONEY_FORM                            0.001 0.001 0.001 0.001
-score MONEY_FORM_SHORT                      0.880 0.001 0.880 0.001
-score MONEY_FRAUD_3                         2.422 2.606 2.422 2.606
+score MONEY_FORM_SHORT                      0.882 0.001 0.882 0.001
+score MONEY_FRAUD_3                         2.655 2.343 2.655 2.343
 score MONEY_FRAUD_5                         0.001 0.001 0.001 0.001
 score MONEY_FRAUD_8                         0.001 0.001 0.001 0.001
-score MONEY_FREEMAIL_REPTO                  2.999 1.090 2.999 1.090
-score MONEY_FROM_41                         1.423 2.000 1.423 2.000
+score MONEY_FREEMAIL_REPTO                  2.999 1.091 2.999 1.091
+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                          2.499 2.499 2.499 2.499
 score MSGID_DOLLARS_URI_IMG                 1.000 1.000 1.000 1.000
 score MSGID_HDR_MALF                        1.000 3.499 1.000 3.499
-score MSGID_NOFQDN1                         0.001 2.198 0.001 2.198
+score MSGID_NOFQDN1                         0.501 2.194 0.501 2.194
 score MSM_PRIO_REPTO                        1.000 1.000 1.000 1.000
 score NA_DOLLARS                            1.499 1.499 1.499 1.499
 score NEWEGG_IMG_NOT_RCVD_NEGG              1.000 1.000 1.000 1.000
 score NEW_PRODUCTS                          1.000 1.000 1.000 1.000
-score NICE_REPLY_A                          -1.928 -2.944 -1.928 -2.944
-score NORDNS_LOW_CONTRAST                   0.001 1.424 0.001 1.424
+score NICE_REPLY_A                          -4.182 -0.684 -4.182 -0.684
+score NORDNS_LOW_CONTRAST                   0.001 1.426 0.001 1.426
 score NO_FM_NAME_IP_HOSTN                   0.001 0.001 0.001 0.001
 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 OBFU_BITCOIN                          1.000 1.000 1.000 1.000
-score OBFU_TEXT_ATTACH                      1.599 1.594 1.599 1.594
 score ODD_FREEM_REPTO                       1.000 1.000 1.000 1.000
-score PDS_BAD_THREAD_QP_64                  0.999 0.001 0.999 0.001
-score PDS_BRAND_SUBJ_NAKED_TO               0.001 0.999 0.001 0.999
-score PDS_BTC_ID                            0.499 0.499 0.499 0.499
-score PDS_BTC_MSGID                         0.001 0.215 0.001 0.215
+score PDS_BAD_THREAD_QP_64                  1.000 0.001 1.000 0.001
+score PDS_BRAND_SUBJ_NAKED_TO               1.000 0.999 1.000 0.999
+score PDS_BTC_ID                            0.500 0.500 0.500 0.500
+score PDS_BTC_MSGID                         0.001 0.001 0.001 0.001
 score PDS_DBL_URL_TNB_RUNON                 1.999 1.999 1.999 1.999
-score PDS_FRNOM_TODOM_DBL_URL               0.001 0.033 0.001 0.033
-score PDS_FRNOM_TODOM_NAKED_TO              0.452 0.881 0.452 0.881
-score PDS_FROM_2_EMAILS                     0.001 1.756 0.001 1.756
-score PDS_FROM_NAME_TO_DOMAIN               1.947 0.095 1.947 0.095
+score PDS_FRNOM_TODOM_DBL_URL               0.001 0.001 0.001 0.001
+score PDS_FRNOM_TODOM_NAKED_TO              0.717 0.001 0.717 0.001
+score PDS_FROM_2_EMAILS                     0.354 1.750 0.354 1.750
+score PDS_FROM_NAME_TO_DOMAIN               1.682 1.151 1.682 1.151
 score PDS_HELO_SPF_FAIL                     0.001 1.999 0.001 1.999
-score PDS_HP_HELO_NORDNS                    1.000 0.001 1.000 0.001
-score PDS_PHP_EVAL                          1.499 1.458 1.499 1.458
+score PDS_HP_HELO_NORDNS                    0.999 0.001 0.999 0.001
+score PDS_PHP_EVAL                          1.499 1.499 1.499 1.499
 score PHISH_AZURE_CLOUDAPP                  3.500 3.500 3.500 3.500
 score PHISH_FBASEAPP                        1.000 1.000 1.000 1.000
 score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
 score PHP_ORIG_SCRIPT                       1.000 1.000 1.000 1.000
 score PHP_ORIG_SCRIPT_EVAL                  2.999 2.999 2.999 2.999
-score PHP_SCRIPT                            2.499 2.500 2.499 2.500
+score PHP_SCRIPT                            2.499 2.499 2.499 2.499
 score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
 score PP_MIME_FAKE_ASCII_TEXT               0.999 0.001 0.999 0.001
 score PP_TOO_MUCH_UNICODE02                 0.500 0.500 0.500 0.500
@@ -300,19 +299,29 @@
 score RAND_HEADER_LIST_SPOOF                1.000 1.000 1.000 1.000
 score RAND_HEADER_MANY                      1.000 1.000 1.000 1.000
 score RAND_MKTG_HEADER                      1.999 1.999 1.999 1.999
-score RATWARE_NO_RDNS                       2.191 2.743 2.191 2.743
+score RATWARE_NO_RDNS                       0.166 2.343 0.166 2.343
 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_IADB_COURT                    0.001 -0.001 0.001 -0.001
 score RCVD_IN_IADB_LEG_MAND                 0.001 -0.001 0.001 -0.001
+score RCVD_IN_MSPIKE_BL                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_H2                     0.001 -0.001 0.001 -0.001
+score RCVD_IN_MSPIKE_H3                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_H4                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_H5                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L2                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L3                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L4                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L5                     0.001 0.001 0.001 0.001
+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.000 1.000 1.000 1.000
 score REPTO_419_FRAUD                       1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL                   1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL_LOOSE             1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_CNS                   1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_GM                    2.999 1.867 2.999 1.867
+score REPTO_419_FRAUD_GM                    1.153 2.769 1.153 2.769
 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
@@ -323,113 +332,112 @@
 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 REPTO_INFONUMSCOM                     1.000 1.000 1.000 1.000
-score RISK_FREE                             2.599 2.599 2.599 2.599
-score SCC_BODY_SINGLE_WORD                  0.801 0.001 0.801 0.001
-score SCC_BOGUS_CTE_1                       1.873 3.755 1.873 3.755
-score SCC_CANSPAM_1                         3.202 1.342 3.202 1.342
+score RISK_FREE                             2.700 2.600 2.700 2.600
+score SCC_BODY_SINGLE_WORD                  0.391 0.001 0.391 0.001
+score SCC_BOGUS_CTE_1                       2.407 3.999 2.407 3.999
+score SCC_CANSPAM_1                         3.230 2.490 3.230 2.490
 score SCC_CANSPAM_2                         4.199 4.199 4.199 4.199
-score SCC_CTMPP                             0.001 0.872 0.001 0.872
 score SCC_ISEMM_LID_1                       1.000 1.000 1.000 1.000
 score SCC_ISEMM_LID_1A                      1.000 1.000 1.000 1.000
-score SCC_ISEMM_LID_1B                      1.499 1.499 1.499 1.499
-score SCC_SPAMMER_ADDR_2                    3.213 3.499 3.213 3.499
+score SCC_ISEMM_LID_1B                      1.500 1.499 1.500 1.499
+score SCC_SPAMMER_ADDR_2                    3.267 3.500 3.267 3.500
 score SENDGRID_REDIR                        0.001 0.001 0.001 0.001
 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 SHOPIFY_IMG_NOT_RCVD_SFY              2.499 2.499 2.499 2.499
-score SHORTENER_SHORT_IMG                   0.001 1.754 0.001 1.754
-score SHORT_IMG_SUSP_NTLD                   1.000 1.499 1.000 1.499
+score SHORTENER_SHORT_IMG                   0.001 1.752 0.001 1.752
+score SHORT_IMG_SUSP_NTLD                   1.202 1.259 1.202 1.259
 score SHORT_SHORTNER                        1.999 0.001 1.999 0.001
 score SHY_OBFU_EXPIRE                       1.000 1.000 1.000 1.000
 score SHY_OBFU_PASSWORD                     1.000 1.000 1.000 1.000
 score SPAM_CWINDOWSNET                      1.000 1.000 1.000 1.000
 score SPOOFED_FREEMAIL                      0.001 0.001 0.001 0.001
-score SPOOFED_FREEMAIL_NO_RDNS              0.601 0.001 0.601 0.001
+score SPOOFED_FREEMAIL_NO_RDNS              0.366 0.001 0.366 0.001
 score SPOOFED_FREEM_REPTO                   0.001 2.499 0.001 2.499
 score SPOOFED_FREEM_REPTO_CHN               0.001 1.000 0.001 1.000
 score SPOOFED_FREEM_REPTO_RUS               0.001 1.000 0.001 1.000
 score SPOOF_GMAIL_MID                       1.499 1.499 1.499 1.499
-score STATIC_XPRIO_OLE                      1.420 1.260 1.420 1.260
+score STATIC_XPRIO_OLE                      1.010 1.263 1.010 1.263
 score STOCK_TIP                             1.000 1.000 1.000 1.000
-score STY_INVIS_DIRECT                      2.499 0.754 2.499 0.754
-score SUBJ_ATTENTION                        0.499 0.500 0.499 0.500
+score STY_INVIS_DIRECT                      2.499 0.753 2.499 0.753
+score SUBJ_ATTENTION                        0.499 0.499 0.499 0.499
 score SUBJ_BRKN_WORDNUMS                    1.000 1.000 1.000 1.000
-score SUSP_UTF8_WORD_COMBO                  1.703 2.218 1.703 2.218
+score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
+score SUSP_UTF8_WORD_COMBO                  1.869 2.309 1.869 2.309
 score SUSP_UTF8_WORD_FROM                   1.999 1.999 1.999 1.999
-score SUSP_UTF8_WORD_MANY                   1.043 0.459 1.043 0.459
-score SUSP_UTF8_WORD_SUBJ                   1.752 0.793 1.752 0.793
+score SUSP_UTF8_WORD_MANY                   1.579 0.353 1.579 0.353
+score SUSP_UTF8_WORD_SUBJ                   1.300 0.803 1.300 0.803
 score SYSADMIN                              1.000 1.000 1.000 1.000
 score TAGSTAT_IMG_NOT_RCVD_TGST             1.000 1.000 1.000 1.000
 score TARINGANET_IMG_NOT_RCVD_TN            1.000 1.000 1.000 1.000
-score TEQF_USR_POLITE                       0.001 1.989 0.001 1.989
-score THIS_AD                               1.942 1.114 1.942 1.114
-score THIS_IS_ADV_SUSP_NTLD                 0.839 1.207 0.839 1.207
+score TEQF_USR_POLITE                       1.999 1.992 1.999 1.992
+score THIS_AD                               1.932 1.116 1.932 1.116
+score THIS_IS_ADV_SUSP_NTLD                 1.101 0.597 1.101 0.597
 score TONLINE_FAKE_DKIM                     1.000 1.000 1.000 1.000
 score TO_EQ_FM_DIRECT_MX                    0.001 0.001 0.001 0.001
 score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_ONLY                    0.001 1.596 0.001 1.596
 score TO_EQ_FM_SPF_FAIL                     0.001 0.001 0.001 0.001
-score TO_IN_SUBJ                            0.099 0.099 0.099 0.099
-score TO_NAME_SUBJ_NO_RDNS                  2.681 1.920 2.681 1.920
-score TO_NO_BRKTS_FROM_MSSP                 2.499 2.499 2.499 2.499
-score TO_NO_BRKTS_HTML_IMG                  1.999 1.791 1.999 1.791
+score TO_IN_SUBJ                            0.100 0.100 0.100 0.100
+score TO_NAME_SUBJ_NO_RDNS                  2.891 1.979 2.891 1.979
+score TO_NO_BRKTS_FROM_MSSP                 2.500 2.499 2.500 2.499
+score TO_NO_BRKTS_HTML_IMG                  1.999 1.793 1.999 1.793
 score TO_NO_BRKTS_HTML_ONLY                 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_MSFT                      1.750 1.420 1.750 1.420
-score TO_NO_BRKTS_NORDNS_HTML               1.999 1.513 1.999 1.513
-score TO_NO_BRKTS_PCNT                      2.499 2.399 2.499 2.399
+score TO_NO_BRKTS_MSFT                      1.397 1.423 1.397 1.423
+score TO_NO_BRKTS_NORDNS_HTML               1.999 1.370 1.999 1.370
+score TO_NO_BRKTS_PCNT                      2.499 2.400 2.499 2.400
 score TRANSFORM_LIFE                        2.499 2.499 2.499 2.499
-score TVD_DOLLARS_US                        0.001 1.554 0.001 1.554
-score TVD_FROM_1                            0.001 0.999 0.001 0.999
-score TVD_PH_7                              0.001 2.399 0.001 2.399
-score TVD_SPACE_ENCODED                     2.500 1.261 2.500 1.261
-score TVD_SPACE_RATIO_MINFP                 1.601 0.001 1.601 0.001
+score TVD_DOLLARS_US                        0.053 1.551 0.053 1.551
+score TVD_FROM_1                            0.999 0.999 0.999 0.999
+score TVD_PH_7                              2.499 2.399 2.499 2.399
+score TVD_SPACE_ENCODED                     2.499 1.265 2.499 1.265
+score TVD_SPACE_RATIO_MINFP                 1.602 0.001 1.602 0.001
 score TW_GIBBERISH_MANY                     1.000 1.000 1.000 1.000
 score UC_GIBBERISH_OBFU                     1.000 1.000 1.000 1.000
-score UNDISC_FREEM                          2.699 2.699 2.699 2.699
-score UNDISC_MONEY                          2.899 2.899 2.899 2.899
+score UNDISC_FREEM                          2.799 2.699 2.799 2.699
+score UNDISC_MONEY                          2.999 2.899 2.999 2.899
 score UNICODE_OBFU_ASC                      2.499 2.499 2.499 2.499
 score UNICODE_OBFU_ZW                       1.000 1.000 1.000 1.000
 score UNICODE_OBFU_ZW_MANY                  0.001 0.001 0.001 0.001
 score UNSUB_GOOG_FORM                       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 2.999 1.000 2.999
-score URI_CLOUDFLAREIPFS                    2.499 2.499 2.499 2.499
+score URI_CLOUDFLAREIPFS                    2.500 2.499 2.500 2.499
 score URI_DASHGOVEDU                        1.000 1.000 1.000 1.000
 score URI_DATA                              1.000 1.000 1.000 1.000
-score URI_DOTEDU                            1.000 1.000 1.000 1.000
+score URI_DOTEDU                            1.999 1.000 1.999 1.000
 score URI_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
 score URI_FIREBASEAPP                       1.000 1.000 1.000 1.000
-score URI_GOOGLE_PROXY                      2.200 2.199 2.200 2.199
+score URI_GOOGLE_PROXY                      2.199 2.199 2.199 2.199
 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_CWINDOWSNET                   3.136 3.188 3.136 3.188
+score URI_IMG_CWINDOWSNET                   3.136 3.198 3.136 3.198
 score URI_IMG_WP_REDIR                      1.000 1.000 1.000 1.000
 score URI_LONG_REPEAT                       1.000 1.000 1.000 1.000
-score URI_ONLY_MSGID_MALF                   1.538 1.999 1.538 1.999
+score URI_ONLY_MSGID_MALF                   0.001 1.999 0.001 1.999
 score URI_OPTOUT_3LD                        1.000 1.000 1.000 1.000
-score URI_PHISH                             4.000 2.901 4.000 2.901
+score URI_PHISH                             3.999 2.906 3.999 2.906
 score URI_PHP_REDIR                         1.000 1.000 1.000 1.000
-score URI_TRY_3LD                           1.999 1.999 1.999 1.999
+score URI_TRY_3LD                           2.000 1.999 2.000 1.999
 score URI_TRY_USME                          1.000 1.000 1.000 1.000
 score URI_WP_DIRINDEX                       1.000 1.000 1.000 1.000
 score URI_WP_HACKED                         3.499 3.499 3.499 3.499
-score URI_WP_HACKED_2                       2.500 2.499 2.500 2.499
+score URI_WP_HACKED_2                       2.499 2.499 2.499 2.499
 score USB_DRIVES                            1.000 1.000 1.000 1.000
 score US_DOLLARS_3                          1.999 1.999 1.999 1.999
-score VFY_ACCT_NORDNS                       2.040 2.334 2.040 2.334
-score VISTA_COST                            0.506 2.494 0.506 2.494
-score VISTA_TONOM_EQ_TOLOC                  2.499 0.388 2.499 0.388
+score VFY_ACCT_NORDNS                       2.077 2.189 2.077 2.189
+score VISTA_COST                            0.502 1.671 0.502 1.671
+score VISTA_TONOM_EQ_TOLOC                  2.499 0.385 2.499 0.385
 score VPS_NO_NTLD                           1.000 1.000 1.000 1.000
 score WALMART_IMG_NOT_RCVD_WAL              1.000 1.000 1.000 1.000
-score WORD_INVIS                            1.582 1.898 1.582 1.898
+score WORD_INVIS                            1.583 1.897 1.583 1.897
 score WORD_INVIS_MANY                       2.999 2.999 2.999 2.999
-score XFER_LOTSA_MONEY                      0.238 0.001 0.238 0.001
+score XFER_LOTSA_MONEY                      0.001 0.001 0.001 0.001
 score XM_DIGITS_ONLY                        1.000 1.000 1.000 1.000
 score XM_LIGHT_HEAVY                        2.499 2.499 2.499 2.499
 score XM_RANDOM                             2.500 2.499 2.500 2.499
-score XM_RECPTID                            2.999 2.630 2.999 2.630
-score XPRIO                                 0.507 0.001 0.507 0.001
+score XM_RECPTID                            2.999 2.626 2.999 2.626
+score XPRIO                                 0.503 0.001 0.503 0.001
 score XPRIO_SHORT_SUBJ                      1.000 1.000 1.000 1.000
 score XPRIO_VISTA                           1.000 1.000 1.000 1.000
 score YOUR_DELIVERY_ADDRESS                 1.249 1.249 1.249 1.249
-score YOU_INHERIT                           2.581 1.451 2.581 1.451
+score YOU_INHERIT                           0.001 2.456 0.001 2.456
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index de9b6de..dd282bc 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,240 +1,245 @@
-# Using score set 0 logs for revision 1916330 from:
-# ham-ena-week0.r1916330.log ham-ena-week1.r1916330.log ham-ena-week2.r1916330.log ham-ena-week3.r1916330.log ham-ena-week4.r1916330.log ham-giovanni-ham.r1916330.log ham-giovanni-spammy.r1916330.log ham-giovanni-spam.r1916330.log ham-grenier.r1916330.log ham-hege.r1916330.log ham-jhardin.r1916330.log ham-llanga.r1916330.log ham-mmiroslaw-mails-ham.r1916330.log ham-mmiroslaw-mails-spam.r1916330.log ham-spamsponge.r1916330.log ham-tsz-corpus.r1916330.log ham-whyscream.r1916330.log spam-ena-week0.r1916330.log spam-ena-week1.r1916330.log spam-ena-week2.r1916330.log spam-ena-week3.r1916330.log spam-ena-week4.r1916330.log spam-giovanni-ham.r1916330.log spam-giovanni-spammy.r1916330.log spam-giovanni-spam.r1916330.log spam-grenier.r1916330.log spam-hege.r1916330.log spam-jhardin.r1916330.log spam-llanga.r1916330.log spam-mmiroslaw-mails-ham.r1916330.log spam-mmiroslaw-mails-spam.r1916330.log spam-spamsponge.r1916330.log spam-tsz-corpus.r1916330.log spam-whyscream.r1916330.log
+# Using score set 0 logs for revision 1916365 from:
+# ham-ena-week0.r1916365.log ham-ena-week1.r1916365.log ham-ena-week2.r1916365.log ham-ena-week4.r1916365.log ham-giovanni-ham.r1916365.log ham-giovanni-spammy.r1916365.log ham-giovanni-spam.r1916365.log ham-grenier.r1916365.log ham-hege.r1916365.log ham-jhardin.r1916365.log ham-llanga.r1916365.log ham-mmiroslaw-mails-ham.r1916365.log ham-mmiroslaw-mails-spam.r1916365.log ham-spamsponge.r1916365.log ham-tsz-corpus.r1916365.log ham-whyscream.r1916365.log spam-ena-week0.r1916365.log spam-ena-week1.r1916365.log spam-ena-week2.r1916365.log spam-ena-week4.r1916365.log spam-giovanni-ham.r1916365.log spam-giovanni-spammy.r1916365.log spam-giovanni-spam.r1916365.log spam-grenier.r1916365.log spam-hege.r1916365.log spam-jhardin.r1916365.log spam-llanga.r1916365.log spam-mmiroslaw-mails-ham.r1916365.log spam-mmiroslaw-mails-spam.r1916365.log spam-spamsponge.r1916365.log spam-tsz-corpus.r1916365.log spam-whyscream.r1916365.log
 
-score ACCT_PHISHING_MANY             2.999
+score ACCT_PHISHING_MANY             2.500
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.499
 score AC_HTML_NONSENSE_TAGS          1.999
-score AC_POST_EXTRAS                 0.001
-score ADMITS_SPAM                    3.099
-score ADVANCE_FEE_2_NEW_FRM_MNY      0.279
+score AC_POST_EXTRAS                 0.001 # force non-zero
+score ADMITS_SPAM                    3.200
+score ADVANCE_FEE_2_NEW_FRM_MNY      0.299
 score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.500
-score ADVANCE_FEE_3_NEW_FRM_MNY      0.966
+score ADVANCE_FEE_3_NEW              3.499
+score ADVANCE_FEE_3_NEW_FRM_MNY      2.448
 score ADVANCE_FEE_3_NEW_MONEY        0.001
-score ADVANCE_FEE_4_NEW              2.135
-score ADVANCE_FEE_4_NEW_FRM_MNY      0.228
+score ADVANCE_FEE_4_NEW              2.498
+score ADVANCE_FEE_4_NEW_FRM_MNY      1.925
 score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_5_NEW_MONEY        1.567
-score AD_PREFS                       0.001
+score ADVANCE_FEE_5_NEW_MONEY        0.500
+score AD_PREFS                       0.297
 score AMAZON_IMG_NOT_RCVD_AMZN       2.499
 score APOSTROPHE_TOCC                0.999
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_X_FF_SEZ_S                 3.199
-score BIGNUM_EMAILS_FREEM            0.001 # force non-zero
-score BITCOIN_DEADLINE               2.629
-score BITCOIN_EXTORT_01              2.104
-score BITCOIN_MALWARE                2.940
-score BITCOIN_ONAN                   2.813
+score AXB_X_FF_SEZ_S                 3.299
+score BIGNUM_EMAILS_FREEM            0.001
+score BITCOIN_DEADLINE               2.461
+score BITCOIN_EXTORT_01              2.105
+score BITCOIN_MALWARE                3.281
+score BITCOIN_ONAN                   1.847
 score BITCOIN_SPAM_02                2.499
-score BITCOIN_SPAM_03                2.499
-score BITCOIN_SPAM_07                3.499
+score BITCOIN_SPAM_03                2.500
+score BITCOIN_SPAM_07                2.108
 score BITCOIN_SPAM_09                1.499
 score BITCOIN_TOEQFM                 0.001
 score BITCOIN_VISTA                  0.001
 score BITCOIN_XPRIO                  2.499
 score BITCOIN_YOUR_INFO              2.999
 score BODY_SINGLE_URI                2.499
-score BODY_URI_ONLY                  1.851
-score BOGUS_MIME_VERSION             3.500
-score BOGUS_MSM_HDRS                 2.088
+score BODY_URI_ONLY                  2.999
+score BOGUS_MIME_VERSION             3.499
+score BOGUS_MSM_HDRS                 0.108
 score CK_HELO_GENERIC                0.250
 score COMPENSATION                   1.499
 score CTE_8BIT_MISMATCH              0.999
-score DATE_IN_FUTURE_Q_PLUS          3.899
-score DEAR_BENEFICIARY               3.299
+score DATE_IN_FUTURE_Q_PLUS          3.799
+score DEAR_BENEFICIARY               3.399
 score DSN_NO_MIMEVERSION             1.999
-score ENCRYPTED_MESSAGE              -1.000
+score ENCRYPTED_MESSAGE              -0.999
 score END_FUTURE_EMAILS              2.499
 score FACEBOOK_IMG_NOT_RCVD_FB       1.999
-score FBI_MONEY                      1.712
-score FBI_SPOOF                      1.883
-score FILL_THIS_FORM                 0.486
+score FBI_MONEY                      0.251
+score FBI_SPOOF                      1.393
+score FILL_THIS_FORM                 0.487
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_LONG_LINE           2.999
 score FONT_INVIS_MSGID               2.499
-score FONT_INVIS_NORDNS              0.001 # force non-zero
-score FONT_INVIS_POSTEXTRAS          2.655
+score FONT_INVIS_NORDNS              0.001
+score FONT_INVIS_POSTEXTRAS          2.652
 score FORM_FRAUD                     0.999
-score FORM_FRAUD_3                   2.030
-score FORM_FRAUD_5                   3.050
+score FORM_FRAUD_3                   1.474
+score FORM_FRAUD_5                   3.699
 score FOUND_YOU                      3.249
 score FREEMAIL_FORGED_FROMDOMAIN     0.001
 score FROM_ADDR_WS                   0.001
 score FROM_IN_TO_AND_SUBJ            2.199
-score FROM_MISSPACED                 2.000
-score FROM_MISSP_DYNIP               1.660
-score FROM_MISSP_EH_MATCH            1.999
+score FROM_MISSPACED                 1.999
+score FROM_MISSP_DYNIP               1.658
+score FROM_MISSP_EH_MATCH            1.690
 score FROM_MISSP_FREEMAIL            3.599
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.499
-score FROM_MISSP_REPLYTO             2.500
-score FROM_MISSP_TO_UNDISC           0.986
+score FROM_MISSP_PHISH               2.179
+score FROM_MISSP_REPLYTO             2.499
+score FROM_MISSP_TO_UNDISC           1.376
 score FROM_MISSP_USER                0.001
 score FROM_MISSP_XPRIO               2.499
-score FROM_NTLD_REPLY_FREEMAIL       1.485
-score FROM_SUSPICIOUS_NTLD           0.500
+score FROM_NTLD_REPLY_FREEMAIL       1.736
+score FROM_SUSPICIOUS_NTLD           0.499
 score FROM_SUSPICIOUS_NTLD_FP        1.999
-score FROM_UNBAL2                    2.399
-score FROM_WSP_TRAIL                 1.402
+score FROM_UNBAL2                    2.299
+score FROM_WSP_TRAIL                 1.503
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.399
-score FUZZY_CLICK_HERE               3.399
-score FUZZY_IMPORTANT                0.931
+score FUZZY_CLICK_HERE               3.400
+score FUZZY_IMPORTANT                0.730
 score FUZZY_PRIVACY                  2.699
 score FUZZY_SECURITY                 2.899
 score FUZZY_WALLET                   1.799
 score GB_BITCOIN_CP                  2.999
-score GB_CUSTOM_HTM_URI              1.500
-score GB_FAKE_RF_SHORT               1.941
-score GB_FREEMAIL_DISPTO             0.001 # force non-zero
-score GOOG_MALWARE_DNLD              3.887
-score GOOG_REDIR_HTML_ONLY           2.000
+score GB_CUSTOM_HTM_URI              1.040
+score GB_FAKE_RF_SHORT               1.940
+score GB_FREEMAIL_DISPTO             0.001
+score GOOG_MALWARE_DNLD              4.894
+score GOOG_REDIR_HTML_ONLY           1.999
 score GOOG_REDIR_NORDNS              2.500
-score GOOG_STO_IMG_HTML              2.500
-score GOOG_STO_NOIMG_HTML            2.604
-score HDRS_LCASE_IMGONLY             0.100
-score HDRS_MISSP                     2.149
+score GOOG_STO_IMG_HTML              2.504
+score GOOG_STO_NOIMG_HTML            2.999
+score HDRS_LCASE_IMGONLY             0.099
+score HDRS_MISSP                     2.150
 score HDR_ORDER_FTSDMCXX_DIRECT      1.999
-score HDR_ORDER_FTSDMCXX_NORDNS      2.052
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
+score HDR_ORDER_FTSDMCXX_NORDNS      2.188
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
-score HK_LOTTO                       0.999
-score HK_NAME_FM_MR_MRS              1.315
+score HK_LOTTO                       1.000
+score HK_NAME_FM_MR_MRS              1.231
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.999
 score HK_RANDOM_FROM                 0.999
 score HK_RANDOM_REPLYTO              1.000
-score HK_SCAM                        1.319
-score HK_WIN                         0.001
+score HK_SCAM                        0.100
+score HK_WIN                         0.485
 score HOSTED_IMG_DIRECT_MX           3.499
-score HOSTED_IMG_FREEM               1.362
+score HOSTED_IMG_FREEM               1.387
 score HOSTED_IMG_MULTI_PUB_01        2.999
 score HREF_EMPTY_NORDNS              0.001
 score HTML_ENTITY_ASCII              2.999
 score HTML_FONT_TINY_NORDNS          1.999
 score HTML_OFF_PAGE                  2.999
 score HTML_SINGLET_MANY              2.499
-score HTML_TAG_BALANCE_CENTER        3.200
-score HTML_TEXT_INVISIBLE_FONT       1.192
-score HTML_TEXT_INVISIBLE_STYLE      0.503
+score HTML_TAG_BALANCE_CENTER        3.099
+score HTML_TEXT_INVISIBLE_FONT       1.351
+score HTML_TEXT_INVISIBLE_STYLE      0.495
 score IMG_ONLY_FM_DOM_INFO           2.499
-score KHOP_HELO_FCRDNS               0.400
-score LIST_PARTIAL_SHORT_MSG         2.500
+score KHOP_HELO_FCRDNS               0.399
+score LIST_PARTIAL_SHORT_MSG         2.499
 score LONGLN_LOW_CONTRAST            2.499
 score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   1.320
-score LONG_INVISIBLE_TEXT            1.782
-score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    0.001 # force non-zero
+score LONG_IMG_URI                   1.322
+score LONG_INVISIBLE_TEXT            1.785
+score LOTS_OF_MONEY                  0.009
+score LOTTO_AGENT                    0.001
 score LOTTO_DEPT                     1.999
-score MALFORMED_FREEMAIL             1.713
-score MALWARE_NORDNS                 2.045
-score MANY_SUBDOM                    3.099
-score MAY_BE_FORGED                  1.999
+score MALFORMED_FREEMAIL             1.639
+score MALWARE_NORDNS                 1.034
+score MANY_SUBDOM                    3.199
 score MILLION_HUNDRED                0.001
-score MILLION_USD                    1.470
+score MILLION_USD                    0.592
 score MIMEOLE_DIRECT_TO_MX           1.999
 score MIME_NO_TEXT                   1.999
 score MIXED_ES                       1.899
 score MIXED_HREF_CASE                1.999
 score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
-score MONEY_FORM_SHORT               0.880
-score MONEY_FRAUD_3                  2.422
+score MONEY_FORM                     0.001
+score MONEY_FORM_SHORT               0.882
+score MONEY_FRAUD_3                  2.655
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
 score MONEY_FREEMAIL_REPTO           2.999
-score MONEY_FROM_41                  1.423
-score MONEY_FROM_MISSP               0.001
+score MONEY_FROM_41                  1.999
+score MONEY_FROM_MISSP               0.001 # force non-zero
 score MONEY_NOHTML                   2.499
-score MSGID_NOFQDN1                  0.001
+score MSGID_NOFQDN1                  0.501
 score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -1.928
+score NICE_REPLY_A                   -4.182
 score NORDNS_LOW_CONTRAST            0.001
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score OBFU_TEXT_ATTACH               1.599
-score PDS_BAD_THREAD_QP_64           0.999
-score PDS_BTC_ID                     0.499
-score PDS_BTC_MSGID                  0.001
+score PDS_BAD_THREAD_QP_64           1.000
+score PDS_BRAND_SUBJ_NAKED_TO        1.000
+score PDS_BTC_ID                     0.500
+score PDS_BTC_MSGID                  0.001 # force non-zero
 score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_FRNOM_TODOM_DBL_URL        0.001
-score PDS_FRNOM_TODOM_NAKED_TO       0.452
-score PDS_FROM_NAME_TO_DOMAIN        1.947
-score PDS_HP_HELO_NORDNS             1.000
+score PDS_FRNOM_TODOM_DBL_URL        0.001 # force non-zero
+score PDS_FRNOM_TODOM_NAKED_TO       0.717
+score PDS_FROM_2_EMAILS              0.354
+score PDS_FROM_NAME_TO_DOMAIN        1.682
+score PDS_HP_HELO_NORDNS             0.999
 score PDS_PHP_EVAL                   1.499
 score PHP_ORIG_SCRIPT_EVAL           2.999
 score PHP_SCRIPT                     2.499
 score PP_MIME_FAKE_ASCII_TEXT        0.999
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                2.191
-score REPTO_419_FRAUD_GM             2.999
+score RATWARE_NO_RDNS                0.166
+score REPTO_419_FRAUD_GM             1.153
 score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      2.599
-score SCC_BODY_SINGLE_WORD           0.801
-score SCC_BOGUS_CTE_1                1.873
-score SCC_CANSPAM_1                  3.202
+score RISK_FREE                      2.700
+score SCC_BODY_SINGLE_WORD           0.391
+score SCC_BOGUS_CTE_1                2.407
+score SCC_CANSPAM_1                  3.230
 score SCC_CANSPAM_2                  4.199
-score SCC_ISEMM_LID_1B               1.499
-score SCC_SPAMMER_ADDR_2             3.213
+score SCC_ISEMM_LID_1B               1.500
+score SCC_SPAMMER_ADDR_2             3.267
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
 score SHORTENER_SHORT_IMG            0.001
+score SHORT_IMG_SUSP_NTLD            1.202
 score SHORT_SHORTNER                 1.999
-score SPOOFED_FREEMAIL_NO_RDNS       0.601
+score SPOOFED_FREEMAIL_NO_RDNS       0.366
 score SPOOF_GMAIL_MID                1.499
-score STATIC_XPRIO_OLE               1.420
+score STATIC_XPRIO_OLE               1.010
 score STY_INVIS_DIRECT               2.499
 score SUBJ_ATTENTION                 0.499
-score SUSP_UTF8_WORD_COMBO           1.703
+score SUSP_UTF8_WORD_COMBO           1.869
 score SUSP_UTF8_WORD_FROM            1.999
-score SUSP_UTF8_WORD_MANY            1.043
-score SUSP_UTF8_WORD_SUBJ            1.752
-score THIS_AD                        1.942
-score THIS_IS_ADV_SUSP_NTLD          0.839
+score SUSP_UTF8_WORD_MANY            1.579
+score SUSP_UTF8_WORD_SUBJ            1.300
+score TEQF_USR_POLITE                1.999
+score THIS_AD                        1.932
+score THIS_IS_ADV_SUSP_NTLD          1.101
 score TO_EQ_FM_DIRECT_MX             0.001
-score TO_EQ_FM_HTML_ONLY             0.001
-score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           2.681
-score TO_NO_BRKTS_FROM_MSSP          2.499
+score TO_IN_SUBJ                     0.100
+score TO_NAME_SUBJ_NO_RDNS           2.891
+score TO_NO_BRKTS_FROM_MSSP          2.500
 score TO_NO_BRKTS_HTML_IMG           1.999
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               1.750
+score TO_NO_BRKTS_MSFT               1.397
 score TO_NO_BRKTS_NORDNS_HTML        1.999
 score TO_NO_BRKTS_PCNT               2.499
 score TRANSFORM_LIFE                 2.499
-score TVD_SPACE_ENCODED              2.500
-score TVD_SPACE_RATIO_MINFP          1.601
-score UNDISC_FREEM                   2.699
-score UNDISC_MONEY                   2.899
+score TVD_DOLLARS_US                 0.053
+score TVD_FROM_1                     0.999
+score TVD_PH_7                       2.499
+score TVD_SPACE_ENCODED              2.499
+score TVD_SPACE_RATIO_MINFP          1.602
+score UNDISC_FREEM                   2.799
+score UNDISC_MONEY                   2.999
 score UNICODE_OBFU_ASC               2.499
-score UNICODE_OBFU_ZW_MANY           0.001
-score URI_CLOUDFLAREIPFS             2.499
-score URI_GOOGLE_PROXY               2.200
+score UNICODE_OBFU_ZW_MANY           0.001 # force non-zero
+score URI_CLOUDFLAREIPFS             2.500
+score URI_DOTEDU                     1.999
+score URI_GOOGLE_PROXY               2.199
 score URI_GOOG_STO_SPAMMY            2.999
 score URI_IMG_CWINDOWSNET            3.136
-score URI_ONLY_MSGID_MALF            1.538
-score URI_PHISH                      4.000
-score URI_TRY_3LD                    1.999
+score URI_ONLY_MSGID_MALF            0.001
+score URI_PHISH                      3.999
+score URI_TRY_3LD                    2.000
 score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                2.500
+score URI_WP_HACKED_2                2.499
 score US_DOLLARS_3                   1.999
-score VFY_ACCT_NORDNS                2.040
-score VISTA_COST                     0.506
+score VFY_ACCT_NORDNS                2.077
+score VISTA_COST                     0.502
 score VISTA_TONOM_EQ_TOLOC           2.499
-score WORD_INVIS                     1.582
+score WORD_INVIS                     1.583
 score WORD_INVIS_MANY                2.999
-score XFER_LOTSA_MONEY               0.238
+score XFER_LOTSA_MONEY               0.001
 score XM_LIGHT_HEAVY                 2.499
 score XM_RANDOM                      2.500
 score XM_RECPTID                     2.999
-score XPRIO                          0.507
+score XPRIO                          0.503
 score YOUR_DELIVERY_ADDRESS          1.249
-score YOU_INHERIT                    2.581
+score YOU_INHERIT                    0.001
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000
@@ -362,7 +367,6 @@
 score SCC_ISEMM_LID_1A               1.000
 score SENDGRID_REDIR_PHISH           1.000
 score SEO_SUSP_NTLD                  1.000
-score SHORT_IMG_SUSP_NTLD            1.000
 score SHY_OBFU_EXPIRE                1.000
 score SHY_OBFU_PASSWORD              1.000
 score SPAM_CWINDOWSNET               1.000
@@ -380,7 +384,6 @@
 score URI_AZURE_CLOUDAPP             1.000
 score URI_DASHGOVEDU                 1.000
 score URI_DATA                       1.000
-score URI_DOTEDU                     1.000
 score URI_DOTEDU_ENTITY              1.000
 score URI_FIREBASEAPP                1.000
 score URI_HEX_IP                     1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index 198b8b5..e519fce 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -1,91 +1,91 @@
 # Using score set 1 logs for revision 1916360 from:
 # ham-net-ena-week0.r1916360.log ham-net-ena-week1.r1916360.log ham-net-ena-week2.r1916360.log ham-net-ena-week3.r1916360.log ham-net-ena-week4.r1916360.log ham-net-giovanni-ham.r1916360.log ham-net-giovanni-spammy.r1916360.log ham-net-giovanni-spam.r1916360.log ham-net-grenier.r1916360.log ham-net-hege.r1916360.log ham-net-jhardin.r1916360.log ham-net-llanga.r1916360.log ham-net-mmiroslaw-mails-ham.r1916360.log ham-net-mmiroslaw-mails-spam.r1916360.log ham-net-spamsponge.r1916360.log ham-net-tsz-corpus.r1916360.log ham-net-whyscream.r1916360.log spam-net-ena-week0.r1916360.log spam-net-ena-week1.r1916360.log spam-net-ena-week2.r1916360.log spam-net-ena-week3.r1916360.log spam-net-ena-week4.r1916360.log spam-net-giovanni-ham.r1916360.log spam-net-giovanni-spammy.r1916360.log spam-net-giovanni-spam.r1916360.log spam-net-grenier.r1916360.log spam-net-hege.r1916360.log spam-net-jhardin.r1916360.log spam-net-llanga.r1916360.log spam-net-mmiroslaw-mails-ham.r1916360.log spam-net-mmiroslaw-mails-spam.r1916360.log spam-net-spamsponge.r1916360.log spam-net-tsz-corpus.r1916360.log spam-net-whyscream.r1916360.log
 
-score ACCT_PHISHING_MANY             2.998
+score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.499
-score AC_HTML_NONSENSE_TAGS          2.000
-score AC_POST_EXTRAS                 0.819
+score AC_HTML_NONSENSE_TAGS          1.999
+score AC_POST_EXTRAS                 0.815
 score ADMITS_SPAM                    3.099
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.300
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.448
 score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.259
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.193
+score ADVANCE_FEE_3_NEW              3.267
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.620
 score ADVANCE_FEE_3_NEW_MONEY        0.001
 score ADVANCE_FEE_4_NEW              0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY      2.499
+score ADVANCE_FEE_4_NEW_FRM_MNY      0.250
 score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_5_NEW_MONEY        0.604
-score AD_PREFS                       0.331
+score ADVANCE_FEE_5_NEW_MONEY        0.745
+score AD_PREFS                       0.429
 score AMAZON_IMG_NOT_RCVD_AMZN       2.499
 score APOSTROPHE_TOCC                0.999
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
 score AXB_X_FF_SEZ_S                 3.199
 score BIGNUM_EMAILS_FREEM            0.001
-score BITCOIN_DEADLINE               1.884
-score BITCOIN_EXTORT_01              2.002
-score BITCOIN_MALWARE                2.429
-score BITCOIN_ONAN                   2.079
-score BITCOIN_SPAM_02                1.051
-score BITCOIN_SPAM_03                2.500
-score BITCOIN_SPAM_05                1.571
-score BITCOIN_SPAM_07                2.134
-score BITCOIN_SPAM_09                1.499
+score BITCOIN_DEADLINE               1.796
+score BITCOIN_EXTORT_01              2.004
+score BITCOIN_MALWARE                3.045
+score BITCOIN_ONAN                   2.830
+score BITCOIN_SPAM_02                0.220
+score BITCOIN_SPAM_03                2.499
+score BITCOIN_SPAM_05                1.200
+score BITCOIN_SPAM_07                3.200
+score BITCOIN_SPAM_09                1.500
 score BITCOIN_TOEQFM                 0.001
-score BITCOIN_VISTA                  2.429
+score BITCOIN_VISTA                  2.571
 score BITCOIN_XPRIO                  2.499
 score BITCOIN_YOUR_INFO              2.999
-score BODY_SINGLE_URI                0.298
-score BODY_URI_ONLY                  0.704
-score BOGUS_MIME_VERSION             2.365
-score BOGUS_MSM_HDRS                 1.745
+score BODY_SINGLE_URI                0.292
+score BODY_URI_ONLY                  0.703
+score BOGUS_MIME_VERSION             1.297
+score BOGUS_MSM_HDRS                 0.044
 score CK_HELO_GENERIC                0.249
 score COMPENSATION                   1.499
 score CTE_8BIT_MISMATCH              0.001
-score DATE_IN_FUTURE_Q_PLUS          3.014
+score DATE_IN_FUTURE_Q_PLUS          3.360
 score DEAR_BENEFICIARY               3.299
-score DKIMWL_WL_HIGH                 -0.316
+score DKIMWL_WL_HIGH                 -0.374
 score DKIMWL_WL_MED                  -0.001
 score DKIMWL_WL_MEDHI                -0.001
 score DSN_NO_MIMEVERSION             1.999
 score ENCRYPTED_MESSAGE              -0.999
 score END_FUTURE_EMAILS              2.499
-score FACEBOOK_IMG_NOT_RCVD_FB       1.999
-score FBI_MONEY                      0.832
+score FACEBOOK_IMG_NOT_RCVD_FB       2.000
+score FBI_MONEY                      1.131
 score FBI_SPOOF                      1.999
 score FILL_THIS_FORM                 0.001
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               2.500
+score FONT_INVIS_MSGID               2.499
 score FONT_INVIS_NORDNS              1.236
-score FONT_INVIS_POSTEXTRAS          2.971
-score FORGED_SPF_HELO                1.900
+score FONT_INVIS_POSTEXTRAS          2.976
+score FORGED_SPF_HELO                1.899
 score FORM_FRAUD                     0.999
-score FORM_FRAUD_3                   0.412
-score FORM_FRAUD_5                   3.111
+score FORM_FRAUD_3                   1.874
+score FORM_FRAUD_5                   2.920
 score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
+score FREEMAIL_FORGED_FROMDOMAIN     0.001
 score FROM_ADDR_WS                   0.001
 score FROM_BANK_NOAUTH               0.999
 score FROM_FMBLA_NEWDOM              1.499
-score FROM_FMBLA_NEWDOM14            0.999
-score FROM_FMBLA_NEWDOM28            0.800
-score FROM_GOV_DKIM_AU               -0.346
-score FROM_IN_TO_AND_SUBJ            1.790
+score FROM_FMBLA_NEWDOM14            1.000
+score FROM_FMBLA_NEWDOM28            0.799
+score FROM_GOV_DKIM_AU               -0.999
+score FROM_IN_TO_AND_SUBJ            1.602
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               0.584
-score FROM_MISSP_EH_MATCH            0.765
+score FROM_MISSP_DYNIP               0.540
+score FROM_MISSP_EH_MATCH            0.772
 score FROM_MISSP_FREEMAIL            3.499
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               0.043
-score FROM_MISSP_REPLYTO             0.808
-score FROM_MISSP_SPF_FAIL            1.250
-score FROM_MISSP_TO_UNDISC           1.464
+score FROM_MISSP_PHISH               1.376
+score FROM_MISSP_REPLYTO             0.853
+score FROM_MISSP_SPF_FAIL            1.074
+score FROM_MISSP_TO_UNDISC           2.007
 score FROM_MISSP_USER                0.001
 score FROM_MISSP_XPRIO               2.499
-score FROM_NTLD_REPLY_FREEMAIL       0.260
+score FROM_NTLD_REPLY_FREEMAIL       0.813
 score FROM_PAYPAL_SPOOF              1.599
 score FROM_SUSPICIOUS_NTLD           0.499
 score FROM_SUSPICIOUS_NTLD_FP        1.999
@@ -96,177 +96,175 @@
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.399
 score FUZZY_CLICK_HERE               3.299
-score FUZZY_IMPORTANT                2.130
-score FUZZY_PRIVACY                  2.600
+score FUZZY_IMPORTANT                2.135
+score FUZZY_PRIVACY                  2.599
 score FUZZY_SECURITY                 2.799
-score FUZZY_WALLET                   0.252
+score FUZZY_WALLET                   0.257
 score GB_BITCOIN_CP                  2.999
 score GB_CUSTOM_HTM_URI              0.001
 score GB_FAKE_RF_SHORT               1.999
 score GB_FREEMAIL_DISPTO             0.001
-score GB_HASHBL_BTC                  4.816
-score GOOG_MALWARE_DNLD              3.498
+score GB_HASHBL_BTC                  4.532
+score GOOG_MALWARE_DNLD              3.495
 score GOOG_REDIR_HTML_ONLY           1.999
 score GOOG_REDIR_NORDNS              0.001
-score GOOG_STO_IMG_HTML              2.027
+score GOOG_STO_IMG_HTML              2.024
 score GOOG_STO_NOIMG_HTML            2.999
 score HDRS_LCASE_IMGONLY             0.100
-score HDRS_MISSP                     2.500
+score HDRS_MISSP                     2.499
 score HDR_ORDER_FTSDMCXX_DIRECT      1.999
 score HDR_ORDER_FTSDMCXX_NORDNS      3.499
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
-score HELO_NO_DOMAIN                 0.937
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score HELO_NO_DOMAIN                 1.296
 score HK_LOTTO                       0.999
-score HK_NAME_FM_MR_MRS              0.911
-score HK_NAME_MR_MRS                 1.000
-score HK_RANDOM_ENVFROM              0.001
+score HK_NAME_FM_MR_MRS              0.900
+score HK_NAME_MR_MRS                 0.999
+score HK_RANDOM_ENVFROM              0.001 # force non-zero
 score HK_RANDOM_FROM                 0.999
-score HK_RANDOM_REPLYTO              0.999
+score HK_RANDOM_REPLYTO              1.000
 score HK_SCAM                        1.999
-score HK_WIN                         0.558
-score HOSTED_IMG_DIRECT_MX           2.729
-score HOSTED_IMG_FREEM               1.046
+score HK_WIN                         0.640
+score HOSTED_IMG_DIRECT_MX           2.329
+score HOSTED_IMG_FREEM               1.049
 score HOSTED_IMG_MULTI_PUB_01        2.999
 score HREF_EMPTY_NORDNS              0.001
 score HTML_ENTITY_ASCII              2.999
 score HTML_FONT_TINY_NORDNS          0.001
-score HTML_OFF_PAGE                  2.366
-score HTML_SINGLET_MANY              2.369
+score HTML_OFF_PAGE                  2.634
+score HTML_SINGLET_MANY              2.360
 score HTML_TAG_BALANCE_CENTER        3.099
-score HTML_TEXT_INVISIBLE_FONT       0.053
-score HTML_TEXT_INVISIBLE_STYLE      1.067
+score HTML_TEXT_INVISIBLE_FONT       0.050
+score HTML_TEXT_INVISIBLE_STYLE      1.071
 score IMG_ONLY_FM_DOM_INFO           2.499
 score KHOP_HELO_FCRDNS               0.001
-score LIST_PARTIAL_SHORT_MSG         1.538
+score LIST_PARTIAL_SHORT_MSG         1.554
 score LONGLN_LOW_CONTRAST            0.001
-score LONG_HEX_URI                   2.151
-score LONG_IMG_URI                   1.105
+score LONG_HEX_URI                   2.167
+score LONG_IMG_URI                   1.099
 score LONG_INVISIBLE_TEXT            2.096
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    0.001
 score LOTTO_DEPT                     1.999
-score MALFORMED_FREEMAIL             1.333
-score MALWARE_NORDNS                 1.530
-score MANY_SUBDOM                    3.099
-score MAY_BE_FORGED                  2.199
-score MILLION_HUNDRED                0.001
+score MALFORMED_FREEMAIL             1.330
+score MALWARE_NORDNS                 1.963
+score MANY_SUBDOM                    3.100
+score MILLION_HUNDRED                0.001 # force non-zero
 score MILLION_USD                    1.590
-score MIMEOLE_DIRECT_TO_MX           0.911
+score MIMEOLE_DIRECT_TO_MX           0.855
 score MIME_NO_TEXT                   1.999
 score MIXED_ES                       1.899
 score MIXED_HREF_CASE                1.999
 score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
+score MONEY_FORM                     0.001
 score MONEY_FORM_SHORT               0.001
-score MONEY_FRAUD_3                  2.606
+score MONEY_FRAUD_3                  2.343
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.090
-score MONEY_FROM_41                  2.000
+score MONEY_FREEMAIL_REPTO           1.091
+score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
 score MONEY_NOHTML                   2.499
 score MSGID_HDR_MALF                 3.499
-score MSGID_NOFQDN1                  2.198
+score MSGID_NOFQDN1                  2.194
 score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -2.944
-score NORDNS_LOW_CONTRAST            1.424
+score NICE_REPLY_A                   -0.684
+score NORDNS_LOW_CONTRAST            1.426
 score NO_FM_NAME_IP_HOSTN            0.001
-score NSL_RCVD_FROM_USER             0.001 # force non-zero
-score NSL_RCVD_HELO_USER             0.001 # force non-zero
-score OBFU_TEXT_ATTACH               1.594
+score NSL_RCVD_FROM_USER             0.001
+score NSL_RCVD_HELO_USER             0.001
+score OBFU_TEXT_ATTACH               1.599
 score PDS_BAD_THREAD_QP_64           0.001
 score PDS_BRAND_SUBJ_NAKED_TO        0.999
-score PDS_BTC_ID                     0.499
-score PDS_BTC_MSGID                  0.215
+score PDS_BTC_ID                     0.500
+score PDS_BTC_MSGID                  0.001
 score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_FRNOM_TODOM_DBL_URL        0.033
-score PDS_FRNOM_TODOM_NAKED_TO       0.881
-score PDS_FROM_2_EMAILS              1.756
-score PDS_FROM_NAME_TO_DOMAIN        0.095
+score PDS_FRNOM_TODOM_DBL_URL        0.001
+score PDS_FRNOM_TODOM_NAKED_TO       0.001
+score PDS_FROM_2_EMAILS              1.750
+score PDS_FROM_NAME_TO_DOMAIN        1.151
 score PDS_HELO_SPF_FAIL              1.999
 score PDS_HP_HELO_NORDNS             0.001
-score PDS_PHP_EVAL                   1.458
+score PDS_PHP_EVAL                   1.499
 score PHP_ORIG_SCRIPT_EVAL           2.999
-score PHP_SCRIPT                     2.500
+score PHP_SCRIPT                     2.499
 score PP_MIME_FAKE_ASCII_TEXT        0.001
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                2.743
-score RCVD_IN_IADB_COURT             -0.001 # force non-zero
+score RATWARE_NO_RDNS                2.343
+score RCVD_IN_IADB_COURT             -0.001
 score RCVD_IN_IADB_LEG_MAND          -0.001
 score RCVD_IN_MSPIKE_H2              -0.001
-score REPTO_419_FRAUD_GM             1.867
+score REPTO_419_FRAUD_GM             2.769
 score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      2.599
+score RISK_FREE                      2.600
 score SCC_BODY_SINGLE_WORD           0.001
-score SCC_BOGUS_CTE_1                3.755
-score SCC_CANSPAM_1                  1.342
+score SCC_BOGUS_CTE_1                3.999
+score SCC_CANSPAM_1                  2.490
 score SCC_CANSPAM_2                  4.199
-score SCC_CTMPP                      0.872
+score SCC_CTMPP                      1.214
 score SCC_ISEMM_LID_1B               1.499
-score SCC_SPAMMER_ADDR_2             3.499
+score SCC_SPAMMER_ADDR_2             3.500
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
-score SHORTENER_SHORT_IMG            1.754
-score SHORT_IMG_SUSP_NTLD            1.499
+score SHORTENER_SHORT_IMG            1.752
+score SHORT_IMG_SUSP_NTLD            1.259
 score SHORT_SHORTNER                 0.001
 score SPOOFED_FREEMAIL               0.001
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            2.499
 score SPOOF_GMAIL_MID                1.499
-score STATIC_XPRIO_OLE               1.260
-score STY_INVIS_DIRECT               0.754
-score SUBJ_ATTENTION                 0.500
-score SUSP_UTF8_WORD_COMBO           2.218
+score STATIC_XPRIO_OLE               1.263
+score STY_INVIS_DIRECT               0.753
+score SUBJ_ATTENTION                 0.499
+score SUSP_UTF8_WORD_COMBO           2.309
 score SUSP_UTF8_WORD_FROM            1.999
-score SUSP_UTF8_WORD_MANY            0.459
-score SUSP_UTF8_WORD_SUBJ            0.793
-score TEQF_USR_POLITE                1.989
-score THIS_AD                        1.114
-score THIS_IS_ADV_SUSP_NTLD          1.207
-score TO_EQ_FM_DIRECT_MX             0.001 # force non-zero
+score SUSP_UTF8_WORD_MANY            0.353
+score SUSP_UTF8_WORD_SUBJ            0.803
+score TEQF_USR_POLITE                1.992
+score THIS_AD                        1.116
+score THIS_IS_ADV_SUSP_NTLD          0.597
+score TO_EQ_FM_DIRECT_MX             0.001
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
-score TO_EQ_FM_HTML_ONLY             1.596
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           1.920
+score TO_IN_SUBJ                     0.100
+score TO_NAME_SUBJ_NO_RDNS           1.979
 score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.791
+score TO_NO_BRKTS_HTML_IMG           1.793
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               1.420
-score TO_NO_BRKTS_NORDNS_HTML        1.513
-score TO_NO_BRKTS_PCNT               2.399
+score TO_NO_BRKTS_MSFT               1.423
+score TO_NO_BRKTS_NORDNS_HTML        1.370
+score TO_NO_BRKTS_PCNT               2.400
 score TRANSFORM_LIFE                 2.499
-score TVD_DOLLARS_US                 1.554
+score TVD_DOLLARS_US                 1.551
 score TVD_FROM_1                     0.999
 score TVD_PH_7                       2.399
-score TVD_SPACE_ENCODED              1.261
+score TVD_SPACE_ENCODED              1.265
 score TVD_SPACE_RATIO_MINFP          0.001
 score UNDISC_FREEM                   2.699
 score UNDISC_MONEY                   2.899
 score UNICODE_OBFU_ASC               2.499
-score UNICODE_OBFU_ZW_MANY           0.001 # force non-zero
+score UNICODE_OBFU_ZW_MANY           0.001
 score URI_AZURE_CLOUDAPP             2.999
 score URI_CLOUDFLAREIPFS             2.499
 score URI_GOOGLE_PROXY               2.199
 score URI_GOOG_STO_SPAMMY            2.999
-score URI_IMG_CWINDOWSNET            3.188
+score URI_IMG_CWINDOWSNET            3.198
 score URI_ONLY_MSGID_MALF            1.999
-score URI_PHISH                      2.901
+score URI_PHISH                      2.906
 score URI_TRY_3LD                    1.999
 score URI_WP_HACKED                  3.499
 score URI_WP_HACKED_2                2.499
 score US_DOLLARS_3                   1.999
-score VFY_ACCT_NORDNS                2.334
-score VISTA_COST                     2.494
-score VISTA_TONOM_EQ_TOLOC           0.388
-score WORD_INVIS                     1.898
+score VFY_ACCT_NORDNS                2.189
+score VISTA_COST                     1.671
+score VISTA_TONOM_EQ_TOLOC           0.385
+score WORD_INVIS                     1.897
 score WORD_INVIS_MANY                2.999
 score XFER_LOTSA_MONEY               0.001
 score XM_LIGHT_HEAVY                 2.499
 score XM_RANDOM                      2.499
-score XM_RECPTID                     2.630
+score XM_RECPTID                     2.626
 score XPRIO                          0.001
 score YOUR_DELIVERY_ADDRESS          1.249
-score YOU_INHERIT                    1.451
+score YOU_INHERIT                    2.456
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index de9b6de..dd282bc 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,240 +1,245 @@
-# Using score set 0 logs for revision 1916330 from:
-# ham-ena-week0.r1916330.log ham-ena-week1.r1916330.log ham-ena-week2.r1916330.log ham-ena-week3.r1916330.log ham-ena-week4.r1916330.log ham-giovanni-ham.r1916330.log ham-giovanni-spammy.r1916330.log ham-giovanni-spam.r1916330.log ham-grenier.r1916330.log ham-hege.r1916330.log ham-jhardin.r1916330.log ham-llanga.r1916330.log ham-mmiroslaw-mails-ham.r1916330.log ham-mmiroslaw-mails-spam.r1916330.log ham-spamsponge.r1916330.log ham-tsz-corpus.r1916330.log ham-whyscream.r1916330.log spam-ena-week0.r1916330.log spam-ena-week1.r1916330.log spam-ena-week2.r1916330.log spam-ena-week3.r1916330.log spam-ena-week4.r1916330.log spam-giovanni-ham.r1916330.log spam-giovanni-spammy.r1916330.log spam-giovanni-spam.r1916330.log spam-grenier.r1916330.log spam-hege.r1916330.log spam-jhardin.r1916330.log spam-llanga.r1916330.log spam-mmiroslaw-mails-ham.r1916330.log spam-mmiroslaw-mails-spam.r1916330.log spam-spamsponge.r1916330.log spam-tsz-corpus.r1916330.log spam-whyscream.r1916330.log
+# Using score set 0 logs for revision 1916365 from:
+# ham-ena-week0.r1916365.log ham-ena-week1.r1916365.log ham-ena-week2.r1916365.log ham-ena-week4.r1916365.log ham-giovanni-ham.r1916365.log ham-giovanni-spammy.r1916365.log ham-giovanni-spam.r1916365.log ham-grenier.r1916365.log ham-hege.r1916365.log ham-jhardin.r1916365.log ham-llanga.r1916365.log ham-mmiroslaw-mails-ham.r1916365.log ham-mmiroslaw-mails-spam.r1916365.log ham-spamsponge.r1916365.log ham-tsz-corpus.r1916365.log ham-whyscream.r1916365.log spam-ena-week0.r1916365.log spam-ena-week1.r1916365.log spam-ena-week2.r1916365.log spam-ena-week4.r1916365.log spam-giovanni-ham.r1916365.log spam-giovanni-spammy.r1916365.log spam-giovanni-spam.r1916365.log spam-grenier.r1916365.log spam-hege.r1916365.log spam-jhardin.r1916365.log spam-llanga.r1916365.log spam-mmiroslaw-mails-ham.r1916365.log spam-mmiroslaw-mails-spam.r1916365.log spam-spamsponge.r1916365.log spam-tsz-corpus.r1916365.log spam-whyscream.r1916365.log
 
-score ACCT_PHISHING_MANY             2.999
+score ACCT_PHISHING_MANY             2.500
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.499
 score AC_HTML_NONSENSE_TAGS          1.999
-score AC_POST_EXTRAS                 0.001
-score ADMITS_SPAM                    3.099
-score ADVANCE_FEE_2_NEW_FRM_MNY      0.279
+score AC_POST_EXTRAS                 0.001 # force non-zero
+score ADMITS_SPAM                    3.200
+score ADVANCE_FEE_2_NEW_FRM_MNY      0.299
 score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.500
-score ADVANCE_FEE_3_NEW_FRM_MNY      0.966
+score ADVANCE_FEE_3_NEW              3.499
+score ADVANCE_FEE_3_NEW_FRM_MNY      2.448
 score ADVANCE_FEE_3_NEW_MONEY        0.001
-score ADVANCE_FEE_4_NEW              2.135
-score ADVANCE_FEE_4_NEW_FRM_MNY      0.228
+score ADVANCE_FEE_4_NEW              2.498
+score ADVANCE_FEE_4_NEW_FRM_MNY      1.925
 score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_5_NEW_MONEY        1.567
-score AD_PREFS                       0.001
+score ADVANCE_FEE_5_NEW_MONEY        0.500
+score AD_PREFS                       0.297
 score AMAZON_IMG_NOT_RCVD_AMZN       2.499
 score APOSTROPHE_TOCC                0.999
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_X_FF_SEZ_S                 3.199
-score BIGNUM_EMAILS_FREEM            0.001 # force non-zero
-score BITCOIN_DEADLINE               2.629
-score BITCOIN_EXTORT_01              2.104
-score BITCOIN_MALWARE                2.940
-score BITCOIN_ONAN                   2.813
+score AXB_X_FF_SEZ_S                 3.299
+score BIGNUM_EMAILS_FREEM            0.001
+score BITCOIN_DEADLINE               2.461
+score BITCOIN_EXTORT_01              2.105
+score BITCOIN_MALWARE                3.281
+score BITCOIN_ONAN                   1.847
 score BITCOIN_SPAM_02                2.499
-score BITCOIN_SPAM_03                2.499
-score BITCOIN_SPAM_07                3.499
+score BITCOIN_SPAM_03                2.500
+score BITCOIN_SPAM_07                2.108
 score BITCOIN_SPAM_09                1.499
 score BITCOIN_TOEQFM                 0.001
 score BITCOIN_VISTA                  0.001
 score BITCOIN_XPRIO                  2.499
 score BITCOIN_YOUR_INFO              2.999
 score BODY_SINGLE_URI                2.499
-score BODY_URI_ONLY                  1.851
-score BOGUS_MIME_VERSION             3.500
-score BOGUS_MSM_HDRS                 2.088
+score BODY_URI_ONLY                  2.999
+score BOGUS_MIME_VERSION             3.499
+score BOGUS_MSM_HDRS                 0.108
 score CK_HELO_GENERIC                0.250
 score COMPENSATION                   1.499
 score CTE_8BIT_MISMATCH              0.999
-score DATE_IN_FUTURE_Q_PLUS          3.899
-score DEAR_BENEFICIARY               3.299
+score DATE_IN_FUTURE_Q_PLUS          3.799
+score DEAR_BENEFICIARY               3.399
 score DSN_NO_MIMEVERSION             1.999
-score ENCRYPTED_MESSAGE              -1.000
+score ENCRYPTED_MESSAGE              -0.999
 score END_FUTURE_EMAILS              2.499
 score FACEBOOK_IMG_NOT_RCVD_FB       1.999
-score FBI_MONEY                      1.712
-score FBI_SPOOF                      1.883
-score FILL_THIS_FORM                 0.486
+score FBI_MONEY                      0.251
+score FBI_SPOOF                      1.393
+score FILL_THIS_FORM                 0.487
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_LONG_LINE           2.999
 score FONT_INVIS_MSGID               2.499
-score FONT_INVIS_NORDNS              0.001 # force non-zero
-score FONT_INVIS_POSTEXTRAS          2.655
+score FONT_INVIS_NORDNS              0.001
+score FONT_INVIS_POSTEXTRAS          2.652
 score FORM_FRAUD                     0.999
-score FORM_FRAUD_3                   2.030
-score FORM_FRAUD_5                   3.050
+score FORM_FRAUD_3                   1.474
+score FORM_FRAUD_5                   3.699
 score FOUND_YOU                      3.249
 score FREEMAIL_FORGED_FROMDOMAIN     0.001
 score FROM_ADDR_WS                   0.001
 score FROM_IN_TO_AND_SUBJ            2.199
-score FROM_MISSPACED                 2.000
-score FROM_MISSP_DYNIP               1.660
-score FROM_MISSP_EH_MATCH            1.999
+score FROM_MISSPACED                 1.999
+score FROM_MISSP_DYNIP               1.658
+score FROM_MISSP_EH_MATCH            1.690
 score FROM_MISSP_FREEMAIL            3.599
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               3.499
-score FROM_MISSP_REPLYTO             2.500
-score FROM_MISSP_TO_UNDISC           0.986
+score FROM_MISSP_PHISH               2.179
+score FROM_MISSP_REPLYTO             2.499
+score FROM_MISSP_TO_UNDISC           1.376
 score FROM_MISSP_USER                0.001
 score FROM_MISSP_XPRIO               2.499
-score FROM_NTLD_REPLY_FREEMAIL       1.485
-score FROM_SUSPICIOUS_NTLD           0.500
+score FROM_NTLD_REPLY_FREEMAIL       1.736
+score FROM_SUSPICIOUS_NTLD           0.499
 score FROM_SUSPICIOUS_NTLD_FP        1.999
-score FROM_UNBAL2                    2.399
-score FROM_WSP_TRAIL                 1.402
+score FROM_UNBAL2                    2.299
+score FROM_WSP_TRAIL                 1.503
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.399
-score FUZZY_CLICK_HERE               3.399
-score FUZZY_IMPORTANT                0.931
+score FUZZY_CLICK_HERE               3.400
+score FUZZY_IMPORTANT                0.730
 score FUZZY_PRIVACY                  2.699
 score FUZZY_SECURITY                 2.899
 score FUZZY_WALLET                   1.799
 score GB_BITCOIN_CP                  2.999
-score GB_CUSTOM_HTM_URI              1.500
-score GB_FAKE_RF_SHORT               1.941
-score GB_FREEMAIL_DISPTO             0.001 # force non-zero
-score GOOG_MALWARE_DNLD              3.887
-score GOOG_REDIR_HTML_ONLY           2.000
+score GB_CUSTOM_HTM_URI              1.040
+score GB_FAKE_RF_SHORT               1.940
+score GB_FREEMAIL_DISPTO             0.001
+score GOOG_MALWARE_DNLD              4.894
+score GOOG_REDIR_HTML_ONLY           1.999
 score GOOG_REDIR_NORDNS              2.500
-score GOOG_STO_IMG_HTML              2.500
-score GOOG_STO_NOIMG_HTML            2.604
-score HDRS_LCASE_IMGONLY             0.100
-score HDRS_MISSP                     2.149
+score GOOG_STO_IMG_HTML              2.504
+score GOOG_STO_NOIMG_HTML            2.999
+score HDRS_LCASE_IMGONLY             0.099
+score HDRS_MISSP                     2.150
 score HDR_ORDER_FTSDMCXX_DIRECT      1.999
-score HDR_ORDER_FTSDMCXX_NORDNS      2.052
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
+score HDR_ORDER_FTSDMCXX_NORDNS      2.188
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
-score HK_LOTTO                       0.999
-score HK_NAME_FM_MR_MRS              1.315
+score HK_LOTTO                       1.000
+score HK_NAME_FM_MR_MRS              1.231
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.999
 score HK_RANDOM_FROM                 0.999
 score HK_RANDOM_REPLYTO              1.000
-score HK_SCAM                        1.319
-score HK_WIN                         0.001
+score HK_SCAM                        0.100
+score HK_WIN                         0.485
 score HOSTED_IMG_DIRECT_MX           3.499
-score HOSTED_IMG_FREEM               1.362
+score HOSTED_IMG_FREEM               1.387
 score HOSTED_IMG_MULTI_PUB_01        2.999
 score HREF_EMPTY_NORDNS              0.001
 score HTML_ENTITY_ASCII              2.999
 score HTML_FONT_TINY_NORDNS          1.999
 score HTML_OFF_PAGE                  2.999
 score HTML_SINGLET_MANY              2.499
-score HTML_TAG_BALANCE_CENTER        3.200
-score HTML_TEXT_INVISIBLE_FONT       1.192
-score HTML_TEXT_INVISIBLE_STYLE      0.503
+score HTML_TAG_BALANCE_CENTER        3.099
+score HTML_TEXT_INVISIBLE_FONT       1.351
+score HTML_TEXT_INVISIBLE_STYLE      0.495
 score IMG_ONLY_FM_DOM_INFO           2.499
-score KHOP_HELO_FCRDNS               0.400
-score LIST_PARTIAL_SHORT_MSG         2.500
+score KHOP_HELO_FCRDNS               0.399
+score LIST_PARTIAL_SHORT_MSG         2.499
 score LONGLN_LOW_CONTRAST            2.499
 score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   1.320
-score LONG_INVISIBLE_TEXT            1.782
-score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    0.001 # force non-zero
+score LONG_IMG_URI                   1.322
+score LONG_INVISIBLE_TEXT            1.785
+score LOTS_OF_MONEY                  0.009
+score LOTTO_AGENT                    0.001
 score LOTTO_DEPT                     1.999
-score MALFORMED_FREEMAIL             1.713
-score MALWARE_NORDNS                 2.045
-score MANY_SUBDOM                    3.099
-score MAY_BE_FORGED                  1.999
+score MALFORMED_FREEMAIL             1.639
+score MALWARE_NORDNS                 1.034
+score MANY_SUBDOM                    3.199
 score MILLION_HUNDRED                0.001
-score MILLION_USD                    1.470
+score MILLION_USD                    0.592
 score MIMEOLE_DIRECT_TO_MX           1.999
 score MIME_NO_TEXT                   1.999
 score MIXED_ES                       1.899
 score MIXED_HREF_CASE                1.999
 score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
-score MONEY_FORM_SHORT               0.880
-score MONEY_FRAUD_3                  2.422
+score MONEY_FORM                     0.001
+score MONEY_FORM_SHORT               0.882
+score MONEY_FRAUD_3                  2.655
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
 score MONEY_FREEMAIL_REPTO           2.999
-score MONEY_FROM_41                  1.423
-score MONEY_FROM_MISSP               0.001
+score MONEY_FROM_41                  1.999
+score MONEY_FROM_MISSP               0.001 # force non-zero
 score MONEY_NOHTML                   2.499
-score MSGID_NOFQDN1                  0.001
+score MSGID_NOFQDN1                  0.501
 score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -1.928
+score NICE_REPLY_A                   -4.182
 score NORDNS_LOW_CONTRAST            0.001
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score OBFU_TEXT_ATTACH               1.599
-score PDS_BAD_THREAD_QP_64           0.999
-score PDS_BTC_ID                     0.499
-score PDS_BTC_MSGID                  0.001
+score PDS_BAD_THREAD_QP_64           1.000
+score PDS_BRAND_SUBJ_NAKED_TO        1.000
+score PDS_BTC_ID                     0.500
+score PDS_BTC_MSGID                  0.001 # force non-zero
 score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_FRNOM_TODOM_DBL_URL        0.001
-score PDS_FRNOM_TODOM_NAKED_TO       0.452
-score PDS_FROM_NAME_TO_DOMAIN        1.947
-score PDS_HP_HELO_NORDNS             1.000
+score PDS_FRNOM_TODOM_DBL_URL        0.001 # force non-zero
+score PDS_FRNOM_TODOM_NAKED_TO       0.717
+score PDS_FROM_2_EMAILS              0.354
+score PDS_FROM_NAME_TO_DOMAIN        1.682
+score PDS_HP_HELO_NORDNS             0.999
 score PDS_PHP_EVAL                   1.499
 score PHP_ORIG_SCRIPT_EVAL           2.999
 score PHP_SCRIPT                     2.499
 score PP_MIME_FAKE_ASCII_TEXT        0.999
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                2.191
-score REPTO_419_FRAUD_GM             2.999
+score RATWARE_NO_RDNS                0.166
+score REPTO_419_FRAUD_GM             1.153
 score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      2.599
-score SCC_BODY_SINGLE_WORD           0.801
-score SCC_BOGUS_CTE_1                1.873
-score SCC_CANSPAM_1                  3.202
+score RISK_FREE                      2.700
+score SCC_BODY_SINGLE_WORD           0.391
+score SCC_BOGUS_CTE_1                2.407
+score SCC_CANSPAM_1                  3.230
 score SCC_CANSPAM_2                  4.199
-score SCC_ISEMM_LID_1B               1.499
-score SCC_SPAMMER_ADDR_2             3.213
+score SCC_ISEMM_LID_1B               1.500
+score SCC_SPAMMER_ADDR_2             3.267
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
 score SHORTENER_SHORT_IMG            0.001
+score SHORT_IMG_SUSP_NTLD            1.202
 score SHORT_SHORTNER                 1.999
-score SPOOFED_FREEMAIL_NO_RDNS       0.601
+score SPOOFED_FREEMAIL_NO_RDNS       0.366
 score SPOOF_GMAIL_MID                1.499
-score STATIC_XPRIO_OLE               1.420
+score STATIC_XPRIO_OLE               1.010
 score STY_INVIS_DIRECT               2.499
 score SUBJ_ATTENTION                 0.499
-score SUSP_UTF8_WORD_COMBO           1.703
+score SUSP_UTF8_WORD_COMBO           1.869
 score SUSP_UTF8_WORD_FROM            1.999
-score SUSP_UTF8_WORD_MANY            1.043
-score SUSP_UTF8_WORD_SUBJ            1.752
-score THIS_AD                        1.942
-score THIS_IS_ADV_SUSP_NTLD          0.839
+score SUSP_UTF8_WORD_MANY            1.579
+score SUSP_UTF8_WORD_SUBJ            1.300
+score TEQF_USR_POLITE                1.999
+score THIS_AD                        1.932
+score THIS_IS_ADV_SUSP_NTLD          1.101
 score TO_EQ_FM_DIRECT_MX             0.001
-score TO_EQ_FM_HTML_ONLY             0.001
-score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           2.681
-score TO_NO_BRKTS_FROM_MSSP          2.499
+score TO_IN_SUBJ                     0.100
+score TO_NAME_SUBJ_NO_RDNS           2.891
+score TO_NO_BRKTS_FROM_MSSP          2.500
 score TO_NO_BRKTS_HTML_IMG           1.999
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               1.750
+score TO_NO_BRKTS_MSFT               1.397
 score TO_NO_BRKTS_NORDNS_HTML        1.999
 score TO_NO_BRKTS_PCNT               2.499
 score TRANSFORM_LIFE                 2.499
-score TVD_SPACE_ENCODED              2.500
-score TVD_SPACE_RATIO_MINFP          1.601
-score UNDISC_FREEM                   2.699
-score UNDISC_MONEY                   2.899
+score TVD_DOLLARS_US                 0.053
+score TVD_FROM_1                     0.999
+score TVD_PH_7                       2.499
+score TVD_SPACE_ENCODED              2.499
+score TVD_SPACE_RATIO_MINFP          1.602
+score UNDISC_FREEM                   2.799
+score UNDISC_MONEY                   2.999
 score UNICODE_OBFU_ASC               2.499
-score UNICODE_OBFU_ZW_MANY           0.001
-score URI_CLOUDFLAREIPFS             2.499
-score URI_GOOGLE_PROXY               2.200
+score UNICODE_OBFU_ZW_MANY           0.001 # force non-zero
+score URI_CLOUDFLAREIPFS             2.500
+score URI_DOTEDU                     1.999
+score URI_GOOGLE_PROXY               2.199
 score URI_GOOG_STO_SPAMMY            2.999
 score URI_IMG_CWINDOWSNET            3.136
-score URI_ONLY_MSGID_MALF            1.538
-score URI_PHISH                      4.000
-score URI_TRY_3LD                    1.999
+score URI_ONLY_MSGID_MALF            0.001
+score URI_PHISH                      3.999
+score URI_TRY_3LD                    2.000
 score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                2.500
+score URI_WP_HACKED_2                2.499
 score US_DOLLARS_3                   1.999
-score VFY_ACCT_NORDNS                2.040
-score VISTA_COST                     0.506
+score VFY_ACCT_NORDNS                2.077
+score VISTA_COST                     0.502
 score VISTA_TONOM_EQ_TOLOC           2.499
-score WORD_INVIS                     1.582
+score WORD_INVIS                     1.583
 score WORD_INVIS_MANY                2.999
-score XFER_LOTSA_MONEY               0.238
+score XFER_LOTSA_MONEY               0.001
 score XM_LIGHT_HEAVY                 2.499
 score XM_RANDOM                      2.500
 score XM_RECPTID                     2.999
-score XPRIO                          0.507
+score XPRIO                          0.503
 score YOUR_DELIVERY_ADDRESS          1.249
-score YOU_INHERIT                    2.581
+score YOU_INHERIT                    0.001
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000
@@ -362,7 +367,6 @@
 score SCC_ISEMM_LID_1A               1.000
 score SENDGRID_REDIR_PHISH           1.000
 score SEO_SUSP_NTLD                  1.000
-score SHORT_IMG_SUSP_NTLD            1.000
 score SHY_OBFU_EXPIRE                1.000
 score SHY_OBFU_PASSWORD              1.000
 score SPAM_CWINDOWSNET               1.000
@@ -380,7 +384,6 @@
 score URI_AZURE_CLOUDAPP             1.000
 score URI_DASHGOVEDU                 1.000
 score URI_DATA                       1.000
-score URI_DOTEDU                     1.000
 score URI_DOTEDU_ENTITY              1.000
 score URI_FIREBASEAPP                1.000
 score URI_HEX_IP                     1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index 198b8b5..e519fce 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -1,91 +1,91 @@
 # Using score set 1 logs for revision 1916360 from:
 # ham-net-ena-week0.r1916360.log ham-net-ena-week1.r1916360.log ham-net-ena-week2.r1916360.log ham-net-ena-week3.r1916360.log ham-net-ena-week4.r1916360.log ham-net-giovanni-ham.r1916360.log ham-net-giovanni-spammy.r1916360.log ham-net-giovanni-spam.r1916360.log ham-net-grenier.r1916360.log ham-net-hege.r1916360.log ham-net-jhardin.r1916360.log ham-net-llanga.r1916360.log ham-net-mmiroslaw-mails-ham.r1916360.log ham-net-mmiroslaw-mails-spam.r1916360.log ham-net-spamsponge.r1916360.log ham-net-tsz-corpus.r1916360.log ham-net-whyscream.r1916360.log spam-net-ena-week0.r1916360.log spam-net-ena-week1.r1916360.log spam-net-ena-week2.r1916360.log spam-net-ena-week3.r1916360.log spam-net-ena-week4.r1916360.log spam-net-giovanni-ham.r1916360.log spam-net-giovanni-spammy.r1916360.log spam-net-giovanni-spam.r1916360.log spam-net-grenier.r1916360.log spam-net-hege.r1916360.log spam-net-jhardin.r1916360.log spam-net-llanga.r1916360.log spam-net-mmiroslaw-mails-ham.r1916360.log spam-net-mmiroslaw-mails-spam.r1916360.log spam-net-spamsponge.r1916360.log spam-net-tsz-corpus.r1916360.log spam-net-whyscream.r1916360.log
 
-score ACCT_PHISHING_MANY             2.998
+score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.499
-score AC_HTML_NONSENSE_TAGS          2.000
-score AC_POST_EXTRAS                 0.819
+score AC_HTML_NONSENSE_TAGS          1.999
+score AC_POST_EXTRAS                 0.815
 score ADMITS_SPAM                    3.099
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.300
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.448
 score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.259
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.193
+score ADVANCE_FEE_3_NEW              3.267
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.620
 score ADVANCE_FEE_3_NEW_MONEY        0.001
 score ADVANCE_FEE_4_NEW              0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY      2.499
+score ADVANCE_FEE_4_NEW_FRM_MNY      0.250
 score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_5_NEW_MONEY        0.604
-score AD_PREFS                       0.331
+score ADVANCE_FEE_5_NEW_MONEY        0.745
+score AD_PREFS                       0.429
 score AMAZON_IMG_NOT_RCVD_AMZN       2.499
 score APOSTROPHE_TOCC                0.999
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
 score AXB_X_FF_SEZ_S                 3.199
 score BIGNUM_EMAILS_FREEM            0.001
-score BITCOIN_DEADLINE               1.884
-score BITCOIN_EXTORT_01              2.002
-score BITCOIN_MALWARE                2.429
-score BITCOIN_ONAN                   2.079
-score BITCOIN_SPAM_02                1.051
-score BITCOIN_SPAM_03                2.500
-score BITCOIN_SPAM_05                1.571
-score BITCOIN_SPAM_07                2.134
-score BITCOIN_SPAM_09                1.499
+score BITCOIN_DEADLINE               1.796
+score BITCOIN_EXTORT_01              2.004
+score BITCOIN_MALWARE                3.045
+score BITCOIN_ONAN                   2.830
+score BITCOIN_SPAM_02                0.220
+score BITCOIN_SPAM_03                2.499
+score BITCOIN_SPAM_05                1.200
+score BITCOIN_SPAM_07                3.200
+score BITCOIN_SPAM_09                1.500
 score BITCOIN_TOEQFM                 0.001
-score BITCOIN_VISTA                  2.429
+score BITCOIN_VISTA                  2.571
 score BITCOIN_XPRIO                  2.499
 score BITCOIN_YOUR_INFO              2.999
-score BODY_SINGLE_URI                0.298
-score BODY_URI_ONLY                  0.704
-score BOGUS_MIME_VERSION             2.365
-score BOGUS_MSM_HDRS                 1.745
+score BODY_SINGLE_URI                0.292
+score BODY_URI_ONLY                  0.703
+score BOGUS_MIME_VERSION             1.297
+score BOGUS_MSM_HDRS                 0.044
 score CK_HELO_GENERIC                0.249
 score COMPENSATION                   1.499
 score CTE_8BIT_MISMATCH              0.001
-score DATE_IN_FUTURE_Q_PLUS          3.014
+score DATE_IN_FUTURE_Q_PLUS          3.360
 score DEAR_BENEFICIARY               3.299
-score DKIMWL_WL_HIGH                 -0.316
+score DKIMWL_WL_HIGH                 -0.374
 score DKIMWL_WL_MED                  -0.001
 score DKIMWL_WL_MEDHI                -0.001
 score DSN_NO_MIMEVERSION             1.999
 score ENCRYPTED_MESSAGE              -0.999
 score END_FUTURE_EMAILS              2.499
-score FACEBOOK_IMG_NOT_RCVD_FB       1.999
-score FBI_MONEY                      0.832
+score FACEBOOK_IMG_NOT_RCVD_FB       2.000
+score FBI_MONEY                      1.131
 score FBI_SPOOF                      1.999
 score FILL_THIS_FORM                 0.001
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               2.500
+score FONT_INVIS_MSGID               2.499
 score FONT_INVIS_NORDNS              1.236
-score FONT_INVIS_POSTEXTRAS          2.971
-score FORGED_SPF_HELO                1.900
+score FONT_INVIS_POSTEXTRAS          2.976
+score FORGED_SPF_HELO                1.899
 score FORM_FRAUD                     0.999
-score FORM_FRAUD_3                   0.412
-score FORM_FRAUD_5                   3.111
+score FORM_FRAUD_3                   1.874
+score FORM_FRAUD_5                   2.920
 score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
+score FREEMAIL_FORGED_FROMDOMAIN     0.001
 score FROM_ADDR_WS                   0.001
 score FROM_BANK_NOAUTH               0.999
 score FROM_FMBLA_NEWDOM              1.499
-score FROM_FMBLA_NEWDOM14            0.999
-score FROM_FMBLA_NEWDOM28            0.800
-score FROM_GOV_DKIM_AU               -0.346
-score FROM_IN_TO_AND_SUBJ            1.790
+score FROM_FMBLA_NEWDOM14            1.000
+score FROM_FMBLA_NEWDOM28            0.799
+score FROM_GOV_DKIM_AU               -0.999
+score FROM_IN_TO_AND_SUBJ            1.602
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               0.584
-score FROM_MISSP_EH_MATCH            0.765
+score FROM_MISSP_DYNIP               0.540
+score FROM_MISSP_EH_MATCH            0.772
 score FROM_MISSP_FREEMAIL            3.499
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               0.043
-score FROM_MISSP_REPLYTO             0.808
-score FROM_MISSP_SPF_FAIL            1.250
-score FROM_MISSP_TO_UNDISC           1.464
+score FROM_MISSP_PHISH               1.376
+score FROM_MISSP_REPLYTO             0.853
+score FROM_MISSP_SPF_FAIL            1.074
+score FROM_MISSP_TO_UNDISC           2.007
 score FROM_MISSP_USER                0.001
 score FROM_MISSP_XPRIO               2.499
-score FROM_NTLD_REPLY_FREEMAIL       0.260
+score FROM_NTLD_REPLY_FREEMAIL       0.813
 score FROM_PAYPAL_SPOOF              1.599
 score FROM_SUSPICIOUS_NTLD           0.499
 score FROM_SUSPICIOUS_NTLD_FP        1.999
@@ -96,177 +96,175 @@
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.399
 score FUZZY_CLICK_HERE               3.299
-score FUZZY_IMPORTANT                2.130
-score FUZZY_PRIVACY                  2.600
+score FUZZY_IMPORTANT                2.135
+score FUZZY_PRIVACY                  2.599
 score FUZZY_SECURITY                 2.799
-score FUZZY_WALLET                   0.252
+score FUZZY_WALLET                   0.257
 score GB_BITCOIN_CP                  2.999
 score GB_CUSTOM_HTM_URI              0.001
 score GB_FAKE_RF_SHORT               1.999
 score GB_FREEMAIL_DISPTO             0.001
-score GB_HASHBL_BTC                  4.816
-score GOOG_MALWARE_DNLD              3.498
+score GB_HASHBL_BTC                  4.532
+score GOOG_MALWARE_DNLD              3.495
 score GOOG_REDIR_HTML_ONLY           1.999
 score GOOG_REDIR_NORDNS              0.001
-score GOOG_STO_IMG_HTML              2.027
+score GOOG_STO_IMG_HTML              2.024
 score GOOG_STO_NOIMG_HTML            2.999
 score HDRS_LCASE_IMGONLY             0.100
-score HDRS_MISSP                     2.500
+score HDRS_MISSP                     2.499
 score HDR_ORDER_FTSDMCXX_DIRECT      1.999
 score HDR_ORDER_FTSDMCXX_NORDNS      3.499
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
-score HELO_NO_DOMAIN                 0.937
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score HELO_NO_DOMAIN                 1.296
 score HK_LOTTO                       0.999
-score HK_NAME_FM_MR_MRS              0.911
-score HK_NAME_MR_MRS                 1.000
-score HK_RANDOM_ENVFROM              0.001
+score HK_NAME_FM_MR_MRS              0.900
+score HK_NAME_MR_MRS                 0.999
+score HK_RANDOM_ENVFROM              0.001 # force non-zero
 score HK_RANDOM_FROM                 0.999
-score HK_RANDOM_REPLYTO              0.999
+score HK_RANDOM_REPLYTO              1.000
 score HK_SCAM                        1.999
-score HK_WIN                         0.558
-score HOSTED_IMG_DIRECT_MX           2.729
-score HOSTED_IMG_FREEM               1.046
+score HK_WIN                         0.640
+score HOSTED_IMG_DIRECT_MX           2.329
+score HOSTED_IMG_FREEM               1.049
 score HOSTED_IMG_MULTI_PUB_01        2.999
 score HREF_EMPTY_NORDNS              0.001
 score HTML_ENTITY_ASCII              2.999
 score HTML_FONT_TINY_NORDNS          0.001
-score HTML_OFF_PAGE                  2.366
-score HTML_SINGLET_MANY              2.369
+score HTML_OFF_PAGE                  2.634
+score HTML_SINGLET_MANY              2.360
 score HTML_TAG_BALANCE_CENTER        3.099
-score HTML_TEXT_INVISIBLE_FONT       0.053
-score HTML_TEXT_INVISIBLE_STYLE      1.067
+score HTML_TEXT_INVISIBLE_FONT       0.050
+score HTML_TEXT_INVISIBLE_STYLE      1.071
 score IMG_ONLY_FM_DOM_INFO           2.499
 score KHOP_HELO_FCRDNS               0.001
-score LIST_PARTIAL_SHORT_MSG         1.538
+score LIST_PARTIAL_SHORT_MSG         1.554
 score LONGLN_LOW_CONTRAST            0.001
-score LONG_HEX_URI                   2.151
-score LONG_IMG_URI                   1.105
+score LONG_HEX_URI                   2.167
+score LONG_IMG_URI                   1.099
 score LONG_INVISIBLE_TEXT            2.096
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    0.001
 score LOTTO_DEPT                     1.999
-score MALFORMED_FREEMAIL             1.333
-score MALWARE_NORDNS                 1.530
-score MANY_SUBDOM                    3.099
-score MAY_BE_FORGED                  2.199
-score MILLION_HUNDRED                0.001
+score MALFORMED_FREEMAIL             1.330
+score MALWARE_NORDNS                 1.963
+score MANY_SUBDOM                    3.100
+score MILLION_HUNDRED                0.001 # force non-zero
 score MILLION_USD                    1.590
-score MIMEOLE_DIRECT_TO_MX           0.911
+score MIMEOLE_DIRECT_TO_MX           0.855
 score MIME_NO_TEXT                   1.999
 score MIXED_ES                       1.899
 score MIXED_HREF_CASE                1.999
 score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
+score MONEY_FORM                     0.001
 score MONEY_FORM_SHORT               0.001
-score MONEY_FRAUD_3                  2.606
+score MONEY_FRAUD_3                  2.343
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.090
-score MONEY_FROM_41                  2.000
+score MONEY_FREEMAIL_REPTO           1.091
+score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
 score MONEY_NOHTML                   2.499
 score MSGID_HDR_MALF                 3.499
-score MSGID_NOFQDN1                  2.198
+score MSGID_NOFQDN1                  2.194
 score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -2.944
-score NORDNS_LOW_CONTRAST            1.424
+score NICE_REPLY_A                   -0.684
+score NORDNS_LOW_CONTRAST            1.426
 score NO_FM_NAME_IP_HOSTN            0.001
-score NSL_RCVD_FROM_USER             0.001 # force non-zero
-score NSL_RCVD_HELO_USER             0.001 # force non-zero
-score OBFU_TEXT_ATTACH               1.594
+score NSL_RCVD_FROM_USER             0.001
+score NSL_RCVD_HELO_USER             0.001
+score OBFU_TEXT_ATTACH               1.599
 score PDS_BAD_THREAD_QP_64           0.001
 score PDS_BRAND_SUBJ_NAKED_TO        0.999
-score PDS_BTC_ID                     0.499
-score PDS_BTC_MSGID                  0.215
+score PDS_BTC_ID                     0.500
+score PDS_BTC_MSGID                  0.001
 score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_FRNOM_TODOM_DBL_URL        0.033
-score PDS_FRNOM_TODOM_NAKED_TO       0.881
-score PDS_FROM_2_EMAILS              1.756
-score PDS_FROM_NAME_TO_DOMAIN        0.095
+score PDS_FRNOM_TODOM_DBL_URL        0.001
+score PDS_FRNOM_TODOM_NAKED_TO       0.001
+score PDS_FROM_2_EMAILS              1.750
+score PDS_FROM_NAME_TO_DOMAIN        1.151
 score PDS_HELO_SPF_FAIL              1.999
 score PDS_HP_HELO_NORDNS             0.001
-score PDS_PHP_EVAL                   1.458
+score PDS_PHP_EVAL                   1.499
 score PHP_ORIG_SCRIPT_EVAL           2.999
-score PHP_SCRIPT                     2.500
+score PHP_SCRIPT                     2.499
 score PP_MIME_FAKE_ASCII_TEXT        0.001
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                2.743
-score RCVD_IN_IADB_COURT             -0.001 # force non-zero
+score RATWARE_NO_RDNS                2.343
+score RCVD_IN_IADB_COURT             -0.001
 score RCVD_IN_IADB_LEG_MAND          -0.001
 score RCVD_IN_MSPIKE_H2              -0.001
-score REPTO_419_FRAUD_GM             1.867
+score REPTO_419_FRAUD_GM             2.769
 score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      2.599
+score RISK_FREE                      2.600
 score SCC_BODY_SINGLE_WORD           0.001
-score SCC_BOGUS_CTE_1                3.755
-score SCC_CANSPAM_1                  1.342
+score SCC_BOGUS_CTE_1                3.999
+score SCC_CANSPAM_1                  2.490
 score SCC_CANSPAM_2                  4.199
-score SCC_CTMPP                      0.872
+score SCC_CTMPP                      1.214
 score SCC_ISEMM_LID_1B               1.499
-score SCC_SPAMMER_ADDR_2             3.499
+score SCC_SPAMMER_ADDR_2             3.500
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
-score SHORTENER_SHORT_IMG            1.754
-score SHORT_IMG_SUSP_NTLD            1.499
+score SHORTENER_SHORT_IMG            1.752
+score SHORT_IMG_SUSP_NTLD            1.259
 score SHORT_SHORTNER                 0.001
 score SPOOFED_FREEMAIL               0.001
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            2.499
 score SPOOF_GMAIL_MID                1.499
-score STATIC_XPRIO_OLE               1.260
-score STY_INVIS_DIRECT               0.754
-score SUBJ_ATTENTION                 0.500
-score SUSP_UTF8_WORD_COMBO           2.218
+score STATIC_XPRIO_OLE               1.263
+score STY_INVIS_DIRECT               0.753
+score SUBJ_ATTENTION                 0.499
+score SUSP_UTF8_WORD_COMBO           2.309
 score SUSP_UTF8_WORD_FROM            1.999
-score SUSP_UTF8_WORD_MANY            0.459
-score SUSP_UTF8_WORD_SUBJ            0.793
-score TEQF_USR_POLITE                1.989
-score THIS_AD                        1.114
-score THIS_IS_ADV_SUSP_NTLD          1.207
-score TO_EQ_FM_DIRECT_MX             0.001 # force non-zero
+score SUSP_UTF8_WORD_MANY            0.353
+score SUSP_UTF8_WORD_SUBJ            0.803
+score TEQF_USR_POLITE                1.992
+score THIS_AD                        1.116
+score THIS_IS_ADV_SUSP_NTLD          0.597
+score TO_EQ_FM_DIRECT_MX             0.001
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
-score TO_EQ_FM_HTML_ONLY             1.596
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           1.920
+score TO_IN_SUBJ                     0.100
+score TO_NAME_SUBJ_NO_RDNS           1.979
 score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.791
+score TO_NO_BRKTS_HTML_IMG           1.793
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               1.420
-score TO_NO_BRKTS_NORDNS_HTML        1.513
-score TO_NO_BRKTS_PCNT               2.399
+score TO_NO_BRKTS_MSFT               1.423
+score TO_NO_BRKTS_NORDNS_HTML        1.370
+score TO_NO_BRKTS_PCNT               2.400
 score TRANSFORM_LIFE                 2.499
-score TVD_DOLLARS_US                 1.554
+score TVD_DOLLARS_US                 1.551
 score TVD_FROM_1                     0.999
 score TVD_PH_7                       2.399
-score TVD_SPACE_ENCODED              1.261
+score TVD_SPACE_ENCODED              1.265
 score TVD_SPACE_RATIO_MINFP          0.001
 score UNDISC_FREEM                   2.699
 score UNDISC_MONEY                   2.899
 score UNICODE_OBFU_ASC               2.499
-score UNICODE_OBFU_ZW_MANY           0.001 # force non-zero
+score UNICODE_OBFU_ZW_MANY           0.001
 score URI_AZURE_CLOUDAPP             2.999
 score URI_CLOUDFLAREIPFS             2.499
 score URI_GOOGLE_PROXY               2.199
 score URI_GOOG_STO_SPAMMY            2.999
-score URI_IMG_CWINDOWSNET            3.188
+score URI_IMG_CWINDOWSNET            3.198
 score URI_ONLY_MSGID_MALF            1.999
-score URI_PHISH                      2.901
+score URI_PHISH                      2.906
 score URI_TRY_3LD                    1.999
 score URI_WP_HACKED                  3.499
 score URI_WP_HACKED_2                2.499
 score US_DOLLARS_3                   1.999
-score VFY_ACCT_NORDNS                2.334
-score VISTA_COST                     2.494
-score VISTA_TONOM_EQ_TOLOC           0.388
-score WORD_INVIS                     1.898
+score VFY_ACCT_NORDNS                2.189
+score VISTA_COST                     1.671
+score VISTA_TONOM_EQ_TOLOC           0.385
+score WORD_INVIS                     1.897
 score WORD_INVIS_MANY                2.999
 score XFER_LOTSA_MONEY               0.001
 score XM_LIGHT_HEAVY                 2.499
 score XM_RANDOM                      2.499
-score XM_RECPTID                     2.630
+score XM_RECPTID                     2.626
 score XPRIO                          0.001
 score YOUR_DELIVERY_ADDRESS          1.249
-score YOU_INHERIT                    1.451
+score YOU_INHERIT                    2.456
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index bdb09e3..4737bfd 100644
--- a/rulesrc/scores/stats-set0
+++ b/rulesrc/scores/stats-set0
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 500436  64.287%  (99.437% of non-spam corpus)
-# Correctly spam:     198193  25.460%  (72.025% of spam corpus)
-# False positives:      2834  0.364%  (0.563% of nonspam,  47866 weighted)
-# False negatives:     76981  9.889%  (27.975% of spam, 142718 weighted)
-# Average score for spam:  7.4    nonspam: 0.5
-# Average for false-pos:   6.2  false-neg: 1.9
-# TOTAL:              778444  100.00%
+# Correctly non-spam: 505076  63.390%  (99.422% of non-spam corpus)
+# Correctly spam:     210191  26.380%  (72.791% of spam corpus)
+# False positives:      2935  0.368%  (0.578% of nonspam,  51190 weighted)
+# False negatives:     78570  9.861%  (27.209% of spam, 147493 weighted)
+# Average score for spam:  7.4    nonspam: 0.4
+# Average for false-pos:   6.1  false-neg: 1.9
+# TOTAL:              796772  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  62483  99.43%
-# Correctly spam:      24777  72.00%
-# False positives:       358  0.57%
-# False negatives:      9635  28.00%
-# TCR(l=50): 1.249755  SpamRecall: 72.001%  SpamPrec: 98.576%
+# Correctly non-spam:  63086  99.43%
+# Correctly spam:      26096  72.29%
+# False positives:       359  0.57%
+# False negatives:     10001  27.71%
+# TCR(l=50): 1.291439  SpamRecall: 72.294%  SpamPrec: 98.643%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 494684  98.29%
-# Correctly spam:     120705  43.86%
-# False positives:      8586  1.71%
-# False negatives:    154469  56.14%
-# TCR(l=50): 0.471375  SpamRecall: 43.865%  SpamPrec: 93.359%
+# Correctly non-spam: 499148  98.26%
+# Correctly spam:     126806  43.91%
+# False positives:      8863  1.74%
+# False negatives:    161955  56.09%
+# TCR(l=50): 0.477208  SpamRecall: 43.914%  SpamPrec: 93.467%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  61700  98.18%
-# Correctly spam:      15094  43.86%
-# False positives:      1141  1.82%
-# False negatives:     19318  56.14%
-# TCR(l=50): 0.450608  SpamRecall: 43.863%  SpamPrec: 92.972%
+# Correctly non-spam:  62329  98.24%
+# Correctly spam:      15971  44.24%
+# False positives:      1116  1.76%
+# False negatives:     20126  55.76%
+# TCR(l=50): 0.475423  SpamRecall: 44.245%  SpamPrec: 93.469%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index afade9b..f8f421f 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,11 +1,11 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 505192  63.877%  (99.570% of non-spam corpus)
-# Correctly spam:     227946  28.822%  (80.402% of spam corpus)
-# False positives:      2180  0.276%  (0.430% of nonspam,  89157 weighted)
-# False negatives:     55561  7.025%  (19.598% of spam, 100232 weighted)
-# Average score for spam:  12.3    nonspam: -1.1
+# Correctly non-spam: 505184  63.876%  (99.569% of non-spam corpus)
+# Correctly spam:     227883  28.814%  (80.380% of spam corpus)
+# False positives:      2188  0.277%  (0.431% of nonspam,  89404 weighted)
+# False negatives:     55624  7.033%  (19.620% of spam, 100473 weighted)
+# Average score for spam:  12.2    nonspam: -1.0
 # Average for false-pos:   7.3  false-neg: 1.8
 # TOTAL:              790879  100.00%
 
@@ -13,11 +13,11 @@
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  63086  99.56%
-# Correctly spam:      28380  80.04%
-# False positives:       279  0.44%
-# False negatives:      7076  19.96%
-# TCR(l=50): 1.686293  SpamRecall: 80.043%  SpamPrec: 99.026%
+# Correctly non-spam:  63087  99.56%
+# Correctly spam:      28379  80.04%
+# False positives:       278  0.44%
+# False negatives:      7077  19.96%
+# TCR(l=50): 1.690232  SpamRecall: 80.040%  SpamPrec: 99.030%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...