diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index e3c76f6..af97041 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,7 +1,7 @@
-score ACCT_PHISHING_MANY                    2.999 0.376 2.999 0.376
+score ACCT_PHISHING_MANY                    2.999 0.427 2.999 0.427
 score AC_BR_BONANZA                         0.001 0.001 0.001 0.001
 score AC_DIV_BONANZA                        0.001 0.001 0.001 0.001
-score AC_FROM_MANY_DOTS                     2.999 2.997 2.999 2.997
+score AC_FROM_MANY_DOTS                     2.999 2.996 2.999 2.996
 score AC_HTML_NONSENSE_TAGS                 1.999 1.997 1.999 1.997
 score AC_POST_EXTRAS                        1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS1               1.000 1.000 1.000 1.000
@@ -13,58 +13,58 @@
 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                           4.000 3.895 4.000 3.895
+score ADMITS_SPAM                           3.999 3.895 3.999 3.895
 score ADULT_DATING_COMPANY                  10.001 10.001 10.001 10.001
 score ADVANCE_FEE_2_NEW_FORM                1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY             1.989 0.001 1.989 0.001
-score ADVANCE_FEE_2_NEW_MONEY               1.265 0.001 1.265 0.001
-score ADVANCE_FEE_3_NEW                     2.401 3.496 2.401 3.496
-score ADVANCE_FEE_3_NEW_FRM_MNY             0.866 2.497 0.866 2.497
-score ADVANCE_FEE_3_NEW_MONEY               0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW                     2.040 0.001 2.040 0.001
+score ADVANCE_FEE_2_NEW_FRM_MNY             2.499 0.001 2.499 0.001
+score ADVANCE_FEE_2_NEW_MONEY               1.276 0.001 1.276 0.001
+score ADVANCE_FEE_3_NEW                     2.500 3.496 2.500 3.496
+score ADVANCE_FEE_3_NEW_FRM_MNY             0.001 2.497 0.001 2.497
+score ADVANCE_FEE_3_NEW_MONEY               1.026 0.001 1.026 0.001
+score ADVANCE_FEE_4_NEW                     2.058 2.497 2.058 2.497
 score ADVANCE_FEE_4_NEW_FRM_MNY             0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_MONEY               2.670 2.090 2.670 2.090
-score ADVANCE_FEE_5_NEW                     2.285 2.492 2.285 2.492
-score ADVANCE_FEE_5_NEW_FRM_MNY             2.899 2.796 2.899 2.796
-score ADVANCE_FEE_5_NEW_MONEY               0.001 1.682 0.001 1.682
+score ADVANCE_FEE_4_NEW_MONEY               3.099 2.107 3.099 2.107
+score ADVANCE_FEE_5_NEW                     2.899 2.570 2.899 2.570
+score ADVANCE_FEE_5_NEW_FRM_MNY             2.999 2.796 2.999 2.796
+score ADVANCE_FEE_5_NEW_MONEY               1.383 3.196 1.383 3.196
 score AD_PREFS                              0.499 0.498 0.499 0.498
-score ALIBABA_IMG_NOT_RCVD_ALI              2.499 2.166 2.499 2.166
+score ALIBABA_IMG_NOT_RCVD_ALI              2.499 2.277 2.499 2.277
 score AMAZON_IMG_NOT_RCVD_AMZN              0.001 0.001 0.001 0.001
 score APP_DEVELOPMENT_FREEM                 1.000 1.000 1.000 1.000
-score APP_DEVELOPMENT_NORDNS                1.221 0.813 1.221 0.813
+score APP_DEVELOPMENT_NORDNS                1.215 0.814 1.215 0.814
 score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.973 0.803 0.973 0.803
-score BIGNUM_EMAILS_FREEM                   2.999 2.469 2.999 2.469
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.648 0.797 0.648 0.797
+score BIGNUM_EMAILS_FREEM                   2.999 1.948 2.999 1.948
 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.271 2.720 2.271 2.720
-score BITCOIN_EXTORT_01                     4.692 4.764 4.692 4.764
+score BITCOIN_DEADLINE                      2.570 1.814 2.570 1.814
+score BITCOIN_EXTORT_01                     1.000 3.083 1.000 3.083
 score BITCOIN_EXTORT_02                     1.000 1.000 1.000 1.000
-score BITCOIN_IMGUR                         3.226 3.496 3.226 3.496
+score BITCOIN_IMGUR                         2.581 3.356 2.581 3.356
 score BITCOIN_MALF_HTML                     3.499 3.496 3.499 3.496
-score BITCOIN_MALWARE                       2.104 1.494 2.104 1.494
+score BITCOIN_MALWARE                       2.057 1.322 2.057 1.322
 score BITCOIN_OBFU_SUBJ                     1.000 1.000 1.000 1.000
-score BITCOIN_ONAN                          2.408 2.996 2.408 2.996
+score BITCOIN_ONAN                          2.474 2.996 2.474 2.996
 score BITCOIN_PAY_ME                        1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_01                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_02                       1.494 2.497 1.494 2.497
-score BITCOIN_SPAM_03                       2.499 2.497 2.499 2.497
+score BITCOIN_SPAM_02                       2.043 2.497 2.043 2.497
+score BITCOIN_SPAM_03                       0.001 0.001 0.001 0.001
 score BITCOIN_SPAM_04                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_05                       0.001 0.001 0.001 0.001
 score BITCOIN_SPAM_06                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07                       1.000 1.000 1.000 1.000
+score BITCOIN_SPAM_07                       2.840 1.000 2.840 1.000
 score BITCOIN_SPAM_08                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_09                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_10                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_11                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_12                       1.000 1.000 1.000 1.000
 score BITCOIN_SPF_ONLYALL                   0.001 1.000 0.001 1.000
-score BITCOIN_XPRIO                         0.001 0.004 0.001 0.004
-score BITCOIN_YOUR_INFO                     2.231 1.777 2.231 1.777
-score BODY_SINGLE_URI                       2.499 2.497 2.499 2.497
+score BITCOIN_XPRIO                         0.001 0.001 0.001 0.001
+score BITCOIN_YOUR_INFO                     1.931 2.681 1.931 2.681
+score BODY_SINGLE_URI                       0.660 2.497 0.660 2.497
 score BODY_SINGLE_WORD                      0.001 0.001 0.001 0.001
-score BODY_URI_ONLY                         2.601 1.525 2.601 1.525
-score BOGUS_MIME_VERSION                    3.499 2.550 3.499 2.550
+score BODY_URI_ONLY                         1.955 1.536 1.955 1.536
+score BOGUS_MIME_VERSION                    3.499 1.890 3.499 1.890
 score BOGUS_MSM_HDRS                        1.000 1.000 1.000 1.000
 score BOMB_FREEM                            1.000 1.000 1.000 1.000
 score BOMB_MONEY                            1.000 1.000 1.000 1.000
@@ -75,43 +75,42 @@
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
 score COMPENSATION                          1.499 1.000 1.499 1.000
 score CONTENT_AFTER_HTML                    2.499 2.497 2.499 2.497
-score CTE_8BIT_MISMATCH                     0.999 0.838 0.999 0.838
-score DATE_IN_FUTURE_96_Q                   0.095 1.845 0.095 1.845
+score CTE_8BIT_MISMATCH                     0.999 0.837 0.999 0.837
+score DATE_IN_FUTURE_96_Q                   1.003 2.037 1.003 2.037
 score DAY_I_EARNED                          1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY                      0.690 0.001 0.690 0.001
+score DEAR_BENEFICIARY                      0.010 3.196 0.010 3.196
 score DKIMWL_BL                             0.001 2.996 0.001 2.996
 score DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH                        0.001 -0.697 0.001 -0.697
+score DKIMWL_WL_HIGH                        0.001 -0.693 0.001 -0.693
 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.997 1.999 1.997
 score DYNAMIC_IMGUR                         1.000 1.000 1.000 1.000
-score EBAY_IMG_NOT_RCVD_EBAY                0.828 1.484 0.828 1.484
+score EBAY_IMG_NOT_RCVD_EBAY                0.654 2.999 0.654 2.999
 score ENCRYPTED_MESSAGE                     -1.000 -1.000 -1.000 -1.000
 score END_FUTURE_EMAILS                     2.499 1.000 2.499 1.000
 score ENVFROM_GOOG_TRIX                     1.000 1.000 1.000 1.000
-score FAKE_REPLY_A1                         2.159 2.747 2.159 2.747
-score FAKE_REPLY_B                          1.552 2.110 1.552 2.110
-score FBI_MONEY                             1.049 0.755 1.049 0.755
-score FBI_SPOOF                             1.584 1.343 1.584 1.343
-score FILL_THIS_FORM                        1.200 0.001 1.200 0.001
-score FONT_INVIS_DIRECT                     0.001 1.392 0.001 1.392
+score FAKE_REPLY_A1                         3.299 2.727 3.299 2.727
+score FBI_MONEY                             1.067 0.043 1.067 0.043
+score FBI_SPOOF                             1.836 1.999 1.836 1.999
+score FILL_THIS_FORM                        1.199 0.001 1.199 0.001
+score FONT_INVIS_DIRECT                     0.001 1.750 0.001 1.750
 score FONT_INVIS_DOTGOV                     1.000 1.000 1.000 1.000
-score FONT_INVIS_HTML_NOHTML                2.999 2.846 2.999 2.846
-score FONT_INVIS_LONG_LINE                  1.187 2.997 1.187 2.997
-score FONT_INVIS_MSGID                      2.499 1.722 2.499 1.722
-score FONT_INVIS_NORDNS                     1.781 2.497 1.781 2.497
+score FONT_INVIS_HTML_NOHTML                2.999 2.379 2.999 2.379
+score FONT_INVIS_LONG_LINE                  2.234 2.996 2.234 2.996
+score FONT_INVIS_MSGID                      2.499 1.951 2.499 1.951
+score FONT_INVIS_NORDNS                     1.700 2.497 1.700 2.497
 score FONT_INVIS_POSTEXTRAS                 1.000 1.000 1.000 1.000
 score FORM_FRAUD                            0.001 0.001 0.001 0.001
-score FORM_FRAUD_3                          3.099 0.839 3.099 0.839
-score FORM_FRAUD_5                          2.645 2.858 2.645 2.858
+score FORM_FRAUD_3                          3.199 1.357 3.199 1.357
+score FORM_FRAUD_5                          2.045 1.944 2.045 1.944
 score FORM_LOW_CONTRAST                     1.000 1.000 1.000 1.000
-score FOUND_YOU                             3.249 0.685 3.249 0.685
-score FREEMAIL_FORGED_FROMDOMAIN            0.250 0.248 0.250 0.248
+score FOUND_YOU                             3.249 0.683 3.249 0.683
+score FREEMAIL_FORGED_FROMDOMAIN            0.249 0.248 0.249 0.248
 score FREEM_FRNUM_UNICD_EMPTY               1.000 1.000 1.000 1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB            1.000 1.000 1.000 1.000
-score FROMSPACE                             3.399 2.980 3.399 2.980
+score FROMSPACE                             3.399 3.296 3.399 3.296
 score FROM_2_EMAILS_SHORT                   2.999 2.996 2.999 2.996
 score FROM_ADDR_WS                          1.000 1.000 1.000 1.000
 score FROM_BANK_NOAUTH                      0.001 1.000 0.001 1.000
@@ -122,26 +121,27 @@
 score FROM_GOV_DKIM_AU                      0.001 -0.001 0.001 -0.001
 score FROM_GOV_REPLYTO_FREEMAIL             0.001 1.000 0.001 1.000
 score FROM_GOV_SPOOF                        0.001 0.998 0.001 0.998
-score FROM_IN_TO_AND_SUBJ                   2.599 2.497 2.599 2.497
+score FROM_IN_TO_AND_SUBJ                   2.699 2.497 2.699 2.497
 score FROM_MISSPACED                        0.001 0.001 0.001 0.001
-score FROM_MISSP_DYNIP                      0.001 0.136 0.001 0.136
+score FROM_MISSP_DYNIP                      0.001 2.498 0.001 2.498
 score FROM_MISSP_EH_MATCH                   0.001 0.001 0.001 0.001
 score FROM_MISSP_FREEMAIL                   2.898 0.001 2.898 0.001
-score FROM_MISSP_MSFT                       1.873 0.001 1.873 0.001
-score FROM_MISSP_PHISH                      0.952 0.001 0.952 0.001
-score FROM_MISSP_REPLYTO                    2.397 2.497 2.397 2.497
-score FROM_MISSP_SPF_FAIL                   0.001 0.874 0.001 0.874
+score FROM_MISSP_MSFT                       2.256 0.001 2.256 0.001
+score FROM_MISSP_PHISH                      3.499 0.001 3.499 0.001
+score FROM_MISSP_REPLYTO                    2.413 2.497 2.413 2.497
+score FROM_MISSP_SPF_FAIL                   0.001 0.876 0.001 0.876
 score FROM_MISSP_TO_UNDISC                  0.001 0.001 0.001 0.001
 score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
 score FROM_MULTI_NORDNS                     0.001 3.995 0.001 3.995
-score FROM_NEWDOM_BTC                       0.001 1.122 0.001 1.122
+score FROM_NEWDOM_BTC                       0.001 1.999 0.001 1.999
 score FROM_NTLD_LINKBAIT                    1.000 1.000 1.000 1.000
-score FROM_NTLD_REPLY_FREEMAIL              1.785 0.409 1.785 0.409
+score FROM_NTLD_REPLY_FREEMAIL              1.549 0.685 1.549 0.685
 score FROM_NUMBERO_NEWDOMAIN                0.001 1.000 0.001 1.000
 score FROM_NUMERIC_TLD                      1.000 1.000 1.000 1.000
-score FROM_PAYPAL_SPOOF                     0.001 0.071 0.001 0.071
+score FROM_PAYPAL_SPOOF                     0.001 1.097 0.001 1.097
 score FROM_SUSPICIOUS_NTLD                  0.500 0.498 0.500 0.498
-score FROM_SUSPICIOUS_NTLD_FP               2.000 1.997 2.000 1.997
+score FROM_SUSPICIOUS_NTLD_FP               1.999 1.997 1.999 1.997
+score FROM_WSP_TRAIL                        2.699 0.001 2.699 0.001
 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
@@ -149,54 +149,54 @@
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
 score GB_FAKE_RF_SHORT                      1.999 1.997 1.999 1.997
 score GB_FORGED_MUA_POSTFIX                 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO                    0.487 0.498 0.487 0.498
+score GB_FREEMAIL_DISPTO                    0.499 0.499 0.499 0.499
 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 GOOGLE_DOCS_PHISH                     1.000 1.000 1.000 1.000
 score GOOGLE_DOCS_PHISH_MANY                1.000 1.000 1.000 1.000
-score GOOGLE_DOC_SUSP                       2.999 2.996 2.999 2.996
+score GOOGLE_DOC_SUSP                       3.000 2.996 3.000 2.996
 score GOOGLE_DRIVE_REPLY_BAD_NTLD           1.000 1.000 1.000 1.000
 score GOOG_MALWARE_DNLD                     1.000 1.000 1.000 1.000
-score GOOG_REDIR_NORDNS                     2.498 1.817 2.498 1.817
-score GOOG_STO_EMAIL_PHISH                  2.113 1.000 2.113 1.000
-score GOOG_STO_HTML_PHISH                   2.071 1.587 2.071 1.587
-score GOOG_STO_HTML_PHISH_MANY              1.000 1.000 1.000 1.000
+score GOOG_REDIR_NORDNS                     2.498 1.878 2.498 1.878
+score GOOG_STO_EMAIL_PHISH                  2.205 1.000 2.205 1.000
+score GOOG_STO_HTML_PHISH                   2.475 1.016 2.475 1.016
+score GOOG_STO_HTML_PHISH_MANY              1.610 1.000 1.610 1.000
 score GOOG_STO_IMG_HTML                     2.999 2.996 2.999 2.996
 score GOOG_STO_IMG_NOHTML                   1.000 1.000 1.000 1.000
-score GOOG_STO_NOIMG_HTML                   2.999 2.996 2.999 2.996
+score GOOG_STO_NOIMG_HTML                   2.999 2.997 2.999 2.997
 score HAS_X_NO_RELAY                        1.000 1.000 1.000 1.000
-score HAS_X_OUTGOING_SPAM_STAT              1.674 1.985 1.674 1.985
+score HAS_X_OUTGOING_SPAM_STAT              1.999 1.997 1.999 1.997
 score HDRS_LCASE                            0.100 0.098 0.100 0.098
-score HDRS_LCASE_IMGONLY                    0.100 0.098 0.100 0.098
+score HDRS_LCASE_IMGONLY                    0.100 0.099 0.100 0.099
 score HDRS_MISSP                            2.499 2.497 2.499 2.497
-score HDR_ORDER_FTSDMCXX_DIRECT             1.999 1.810 1.999 1.810
+score HDR_ORDER_FTSDMCXX_DIRECT             1.999 1.816 1.999 1.816
 score HDR_ORDER_FTSDMCXX_NORDNS             0.001 0.001 0.001 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS         0.250 0.248 0.250 0.248
+score HEADER_FROM_DIFFERENT_DOMAINS         0.250 0.249 0.250 0.249
 score HELO_NO_DOMAIN                        0.001 0.001 0.001 0.001
 score HEXHASH_WORD                          1.000 1.000 1.000 1.000
 score HK_CTE_RAW                            1.000 1.000 1.000 1.000
 score HK_LOTTO                              0.999 0.998 0.999 0.998
-score HK_NAME_FM_MR_MRS                     0.678 1.498 0.678 1.498
+score HK_NAME_FM_MR_MRS                     0.550 1.498 0.550 1.498
 score HK_NAME_MR_MRS                        0.999 0.998 0.999 0.998
-score HK_RANDOM_ENVFROM                     0.999 0.998 0.999 0.998
+score HK_RANDOM_ENVFROM                     1.000 0.998 1.000 0.998
 score HK_RANDOM_FROM                        0.999 0.998 0.999 0.998
-score HK_RANDOM_REPLYTO                     0.999 0.904 0.999 0.904
+score HK_RANDOM_REPLYTO                     0.999 0.850 0.999 0.850
 score HK_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
-score HK_SCAM                               1.364 0.001 1.364 0.001
+score HK_SCAM                               1.999 0.731 1.999 0.731
 score HK_WIN                                1.000 1.000 1.000 1.000
-score HOSTED_IMG_DIRECT_MX                  2.705 3.110 2.705 3.110
+score HOSTED_IMG_DIRECT_MX                  3.174 1.730 3.174 1.730
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
 score HOSTED_IMG_FREEM                      3.499 3.496 3.499 3.496
-score HOSTED_IMG_MULTI                      2.259 0.547 2.259 0.547
+score HOSTED_IMG_MULTI                      1.752 0.834 1.752 0.834
 score HOSTED_IMG_MULTI_PUB_01               2.999 2.996 2.999 2.996
-score HTML_ENTITY_ASCII                     2.999 2.953 2.999 2.953
+score HTML_ENTITY_ASCII                     2.999 2.940 2.999 2.940
 score HTML_ENTITY_ASCII_TINY                1.000 1.000 1.000 1.000
 score HTML_OFF_PAGE                         2.999 2.996 2.999 2.996
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY                     0.001 1.161 0.001 1.161
-score HTML_TAG_BALANCE_CENTER               2.692 2.976 2.692 2.976
-score HTML_TEXT_INVISIBLE_FONT              1.187 0.827 1.187 0.827
-score HTML_TEXT_INVISIBLE_STYLE             1.491 1.923 1.491 1.923
+score HTML_SINGLET_MANY                     0.001 1.391 0.001 1.391
+score HTML_TAG_BALANCE_CENTER               3.284 2.963 3.284 2.963
+score HTML_TEXT_INVISIBLE_FONT              1.184 0.496 1.184 0.496
+score HTML_TEXT_INVISIBLE_STYLE             0.901 1.931 0.901 1.931
 score IMG_ONLY_FM_DOM_INFO                  1.000 1.000 1.000 1.000
 score JH_SPAMMY_HEADERS                     3.499 3.496 3.499 3.496
 score JH_SPAMMY_PATTERN01                   1.000 1.000 1.000 1.000
@@ -204,29 +204,29 @@
 score KHOP_FAKE_EBAY                        0.001 1.198 0.001 1.198
 score KHOP_HELO_FCRDNS                      0.400 0.398 0.400 0.398
 score LIST_PRTL_PUMPDUMP                    1.000 1.000 1.000 1.000
-score LIST_PRTL_SAME_USER                   0.001 0.687 0.001 0.687
-score LONG_HEX_URI                          2.599 0.001 2.599 0.001
-score LONG_IMG_URI                          1.273 0.939 1.273 0.939
-score LONG_INVISIBLE_TEXT                   2.999 2.545 2.999 2.545
+score LIST_PRTL_SAME_USER                   0.001 0.901 0.001 0.901
+score LONG_HEX_URI                          2.600 0.001 2.600 0.001
+score LONG_IMG_URI                          0.492 0.929 0.492 0.929
+score LONG_INVISIBLE_TEXT                   1.954 2.302 1.954 2.302
 score LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
-score LOTTO_AGENT                           1.500 1.498 1.500 1.498
-score LOTTO_DEPT                            0.735 0.001 0.735 0.001
+score LOTTO_AGENT                           1.499 1.498 1.499 1.498
+score LOTTO_DEPT                            0.001 0.001 0.001 0.001
 score LUCRATIVE                             1.000 1.000 1.000 1.000
 score MALF_HTML_B64                         1.000 1.000 1.000 1.000
-score MALWARE_NORDNS                        0.001 0.001 0.001 0.001
+score MALWARE_NORDNS                        0.045 0.001 0.045 0.001
 score MALWARE_PASSWORD                      1.000 1.000 1.000 1.000
 score MANY_HDRS_LCASE                       0.100 0.100 0.100 0.100
-score MANY_SPAN_IN_TEXT                     2.699 2.696 2.699 2.696
-score MAY_BE_FORGED                         2.092 2.896 2.092 2.896
-score MILLION_HUNDRED                       0.001 2.996 0.001 2.996
-score MILLION_USD                           0.048 0.978 0.048 0.978
-score MIMEOLE_DIRECT_TO_MX                  0.375 0.001 0.375 0.001
+score MANY_SPAN_IN_TEXT                     2.799 2.619 2.799 2.619
+score MAY_BE_FORGED                         2.090 1.136 2.090 1.136
+score MILLION_HUNDRED                       0.001 0.001 0.001 0.001
+score MILLION_USD                           0.601 0.001 0.601 0.001
+score MIMEOLE_DIRECT_TO_MX                  0.001 0.001 0.001 0.001
 score MIME_NO_TEXT                          1.000 1.000 1.000 1.000
-score MIXED_AREA_CASE                       2.499 2.031 2.499 2.031
-score MIXED_CENTER_CASE                     1.243 1.953 1.243 1.953
-score MIXED_CTYPE_CASE                      2.083 2.429 2.083 2.429
-score MIXED_ES                              3.199 2.596 3.199 2.596
-score MIXED_FONT_CASE                       0.001 0.331 0.001 0.331
+score MIXED_AREA_CASE                       0.001 1.547 0.001 1.547
+score MIXED_CENTER_CASE                     1.242 1.727 1.242 1.727
+score MIXED_CTYPE_CASE                      1.061 1.155 1.061 1.155
+score MIXED_ES                              3.299 2.594 3.299 2.594
+score MIXED_FONT_CASE                       0.001 0.387 0.001 0.387
 score MIXED_HREF_CASE                       1.999 1.997 1.999 1.997
 score MIXED_IMG_CASE                        2.999 2.996 2.999 2.996
 score MONERO_DEADLINE                       1.000 1.000 1.000 1.000
@@ -235,62 +235,61 @@
 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                      2.204 1.698 2.204 1.698
-score MONEY_FRAUD_3                         2.774 2.623 2.774 2.623
-score MONEY_FRAUD_5                         0.001 0.001 0.001 0.001
-score MONEY_FRAUD_8                         3.364 1.296 3.364 1.296
-score MONEY_FREEMAIL_REPTO                  3.000 0.987 3.000 0.987
+score MONEY_FORM_SHORT                      1.953 1.432 1.953 1.432
+score MONEY_FRAUD_3                         3.057 2.798 3.057 2.798
+score MONEY_FRAUD_5                         2.443 0.001 2.443 0.001
+score MONEY_FRAUD_8                         1.039 0.543 1.039 0.543
+score MONEY_FREEMAIL_REPTO                  2.999 1.084 2.999 1.084
 score MONEY_FROM_41                         1.999 1.997 1.999 1.997
 score MONEY_FROM_MISSP                      0.001 0.001 0.001 0.001
-score MONEY_NOHTML                          2.499 2.498 2.499 2.498
+score MONEY_NOHTML                          2.500 2.497 2.500 2.497
 score MSGID_DOLLARS_URI_IMG                 1.000 1.000 1.000 1.000
-score MSGID_HDR_MALF                        2.989 3.496 2.989 3.496
-score MSGID_NOFQDN1                         0.486 2.758 0.486 2.758
-score MSMAIL_PRI_ABNORMAL                   0.001 1.386 0.001 1.386
-score MSM_PRIO_REPTO                        0.001 0.001 0.001 0.001
+score MSGID_HDR_MALF                        2.807 3.496 2.807 3.496
+score MSGID_NOFQDN1                         0.999 1.811 0.999 1.811
+score MSMAIL_PRI_ABNORMAL                   0.001 0.478 0.001 0.478
+score MSM_PRIO_REPTO                        1.000 0.001 1.000 0.001
 score NA_DOLLARS                            1.499 1.498 1.499 1.498
 score NEWEGG_IMG_NOT_RCVD_NEGG              1.000 1.000 1.000 1.000
 score NICE_REPLY_A                          -0.001 -0.001 -0.001 -0.001
-score NORDNS_LOW_CONTRAST                   1.881 2.269 1.881 2.269
+score NORDNS_LOW_CONTRAST                   1.878 2.223 1.878 2.223
 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 NUMBEREND_LINKBAIT                    0.001 0.999 0.001 0.999
+score NUMBEREND_LINKBAIT                    0.649 0.235 0.649 0.235
 score OBFU_BITCOIN                          1.000 1.000 1.000 1.000
-score ODD_FREEM_REPTO                       2.999 2.996 2.999 2.996
-score OFFER_ONLY_AMERICA                    1.268 0.809 1.268 0.809
-score ONLINE_MKTG_CNSLT                     2.700 2.696 2.700 2.696
-score ORDER_TODAY                           1.000 1.000 1.000 1.000
+score ODD_FREEM_REPTO                       2.999 2.935 2.999 2.935
+score OFFER_ONLY_AMERICA                    1.313 0.894 1.313 0.894
+score ONLINE_MKTG_CNSLT                     2.799 2.696 2.799 2.696
 score PDS_BAD_THREAD_QP_64                  0.999 0.998 0.999 0.998
 score PDS_BTC_ID                            0.499 0.498 0.499 0.498
-score PDS_BTC_MSGID                         0.001 0.001 0.001 0.001
-score PDS_DBL_URL_TNB_RUNON                 0.158 0.001 0.158 0.001
+score PDS_BTC_MSGID                         0.001 0.179 0.001 0.179
+score PDS_DBL_URL_TNB_RUNON                 1.403 0.001 1.403 0.001
 score PDS_EMPTYSUBJ_URISHRT                 1.499 0.001 1.499 0.001
-score PDS_FRNOM_TODOM_DBL_URL               1.487 1.498 1.487 1.498
-score PDS_FRNOM_TODOM_NAKED_TO              1.499 1.122 1.499 1.122
-score PDS_FROM_2_EMAILS                     3.132 3.371 3.132 3.371
-score PDS_FROM_2_EMAILS_SHRTNER             1.412 0.867 1.412 0.867
-score PDS_FROM_NAME_TO_DOMAIN               1.999 1.550 1.999 1.550
+score PDS_FRNOM_TODOM_DBL_URL               1.468 1.497 1.468 1.497
+score PDS_FRNOM_TODOM_NAKED_TO              1.499 0.689 1.499 0.689
+score PDS_FROM_2_EMAILS                     3.136 2.652 3.136 2.652
+score PDS_FROM_2_EMAILS_SHRTNER             0.271 0.249 0.271 0.249
+score PDS_FROM_NAME_TO_DOMAIN               1.999 1.836 1.999 1.836
 score PDS_HELO_SPF_FAIL                     0.001 1.000 0.001 1.000
-score PDS_NO_FULL_NAME_SPOOFED_URL          0.175 0.535 0.175 0.535
-score PDS_OTHER_BAD_TLD                     1.999 1.997 1.999 1.997
+score PDS_NO_FULL_NAME_SPOOFED_URL          0.749 0.718 0.749 0.718
+score PDS_OTHER_BAD_TLD                     2.000 1.997 2.000 1.997
 score PDS_PRO_TLD                           0.999 0.998 0.999 0.998
-score PDS_SHORTFWD_URISHRT_FP               1.499 1.499 1.499 1.499
-score PDS_SHORT_SPOOFED_URL                 1.093 1.714 1.093 1.714
-score PDS_TINYSUBJ_URISHRT                  1.103 0.001 1.103 0.001
+score PDS_SHORTFWD_URISHRT_FP               1.499 1.498 1.499 1.498
+score PDS_SHORT_SPOOFED_URL                 1.999 0.806 1.999 0.806
+score PDS_TINYSUBJ_URISHRT                  0.837 0.001 0.837 0.001
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.999 0.001 1.999 0.001
 score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE      1.999 1.997 1.999 1.997
 score PDS_TONAME_EQ_TOLOCAL_SHORT           1.999 1.997 1.999 1.997
-score PDS_TONAME_EQ_TOLOCAL_VSHORT          0.999 0.999 0.999 0.999
+score PDS_TONAME_EQ_TOLOCAL_VSHORT          1.000 0.998 1.000 0.998
 score PHISH_AZURE_CLOUDAPP                  3.500 3.500 3.500 3.500
-score PHISH_FBASEAPP                        1.881 2.494 1.881 2.494
+score PHISH_FBASEAPP                        0.001 2.976 0.001 2.976
 score PHOTO_EDITING_DIRECT                  1.000 1.000 1.000 1.000
 score PHOTO_EDITING_FREEM                   1.000 1.000 1.000 1.000
 score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT                       2.297 0.001 2.297 0.001
-score PHP_SCRIPT                            2.453 0.308 2.453 0.308
+score PHP_ORIG_SCRIPT                       2.251 0.001 2.251 0.001
+score PHP_SCRIPT                            2.499 0.815 2.499 0.815
 score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT               0.999 0.807 0.999 0.807
+score PP_MIME_FAKE_ASCII_TEXT               0.999 0.842 0.999 0.842
 score PP_TOO_MUCH_UNICODE02                 0.500 0.500 0.500 0.500
 score PP_TOO_MUCH_UNICODE05                 1.000 1.000 1.000 1.000
 score PUMPDUMP                              1.000 1.000 1.000 1.000
@@ -298,9 +297,9 @@
 score RAND_HEADER_LIST_SPOOF                2.999 2.996 2.999 2.996
 score RAND_HEADER_MANY                      1.000 1.000 1.000 1.000
 score RAND_MKTG_HEADER                      1.999 1.997 1.999 1.997
-score RATWARE_NO_RDNS                       0.104 2.999 0.104 2.999
+score RATWARE_NO_RDNS                       2.676 1.353 2.676 1.353
 score RCVD_DOTEDU_SHORT                     1.000 1.000 1.000 1.000
-score RCVD_DOTEDU_SUSP_URI                  3.000 2.996 3.000 2.996
+score RCVD_DOTEDU_SUSP_URI                  2.999 2.996 2.999 2.996
 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
@@ -313,32 +312,33 @@
 score RCVD_IN_MSPIKE_WL                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_ZBI                    0.001 0.001 0.001 0.001
 score RDNS_NUM_TLD_ATCHNX                   1.000 1.000 1.000 1.000
-score RDNS_NUM_TLD_XM                       2.996 1.000 2.996 1.000
+score RDNS_NUM_TLD_XM                       1.528 1.000 1.528 1.000
 score READY_TO_SHIP                         1.249 1.248 1.249 1.248
-score REPTO_419_FRAUD                       2.416 2.996 2.416 2.996
+score REPLYTO_EMPTY                         1.935 0.001 1.935 0.001
+score REPTO_419_FRAUD                       2.097 2.996 2.097 2.996
 score REPTO_419_FRAUD_AOL                   1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL_LOOSE             1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_CNS                   1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_GM                    2.999 2.823 2.999 2.823
+score REPTO_419_FRAUD_GM                    2.999 2.502 2.999 2.502
 score REPTO_419_FRAUD_GM_LOOSE              1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_HM                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_OL                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_PM                    1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_QQ                    2.999 2.682 2.999 2.682
+score REPTO_419_FRAUD_QQ                    2.999 2.035 2.999 2.035
 score REPTO_419_FRAUD_YH                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_YH_LOOSE              1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_YJ                    0.001 2.996 0.001 2.996
+score REPTO_419_FRAUD_YJ                    1.570 2.497 1.570 2.497
 score REPTO_419_FRAUD_YN                    1.000 1.000 1.000 1.000
-score RISK_FREE                             1.998 2.896 1.998 2.896
-score SENDGRID_REDIR                        1.499 0.001 1.499 0.001
+score RISK_FREE                             3.099 1.828 3.099 1.828
+score SENDGRID_REDIR                        1.500 0.779 1.500 0.779
 score SENDGRID_REDIR_PHISH                  1.000 1.000 1.000 1.000
-score SEO_SUSP_NTLD                         1.199 0.969 1.199 0.969
-score SERGIO_SUBJECT_VIAGRA01               3.277 4.196 3.277 4.196
+score SEO_SUSP_NTLD                         1.199 0.559 1.199 0.559
+score SERGIO_SUBJECT_VIAGRA01               3.976 4.195 3.976 4.195
 score SHOPIFY_IMG_NOT_RCVD_SFY              2.499 2.497 2.499 2.497
 score SHORTENER_SHORT_IMG                   1.000 1.000 1.000 1.000
-score SHORTENER_SHORT_SUBJ                  2.999 2.326 2.999 2.326
-score SHORT_IMG_SUSP_NTLD                   0.313 1.000 0.313 1.000
-score SHORT_SHORTNER                        1.999 1.997 1.999 1.997
+score SHORTENER_SHORT_SUBJ                  2.999 2.399 2.999 2.399
+score SHORT_IMG_SUSP_NTLD                   0.943 1.000 0.943 1.000
+score SHORT_SHORTNER                        1.999 1.447 1.999 1.447
 score SINGLETS_LOW_CONTRAST                 0.001 0.001 0.001 0.001
 score SPOOFED_FREEMAIL                      0.001 1.497 0.001 1.497
 score SPOOFED_FREEMAIL_NO_RDNS              1.499 0.001 1.499 0.001
@@ -346,83 +346,83 @@
 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.498 1.499 1.498
-score STATIC_XPRIO_OLE                      1.623 0.001 1.623 0.001
-score STOCK_LOW_CONTRAST                    2.499 0.001 2.499 0.001
+score STATIC_XPRIO_OLE                      1.999 0.001 1.999 0.001
+score STOCK_LOW_CONTRAST                    1.949 0.001 1.949 0.001
 score STOCK_TIP                             1.000 1.000 1.000 1.000
 score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
 score SUSP_UTF8_WORD_SUBJ                   1.999 1.997 1.999 1.997
 score SYSADMIN                              1.000 1.000 1.000 1.000
-score THIS_AD                               1.399 0.903 1.399 0.903
-score THIS_IS_ADV_SUSP_NTLD                 1.499 0.402 1.499 0.402
-score THREAD_INDEX_HEX                      1.039 2.131 1.039 2.131
+score THIS_AD                               1.499 0.902 1.499 0.902
+score THIS_IS_ADV_SUSP_NTLD                 1.499 0.877 1.499 0.877
+score THREAD_INDEX_HEX                      1.202 1.689 1.202 1.689
 score TONLINE_FAKE_DKIM                     1.000 1.000 1.000 1.000
 score TONOM_EQ_TOLOC_SHRT_SHRTNER           1.499 1.498 1.499 1.498
-score TO_EQ_FM_DIRECT_MX                    0.833 2.497 0.833 2.497
-score TO_EQ_FM_DOM_HTML_IMG                 0.001 0.052 0.001 0.052
-score TO_EQ_FM_DOM_HTML_ONLY                1.306 0.879 1.306 0.879
-score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.002 0.001 0.002
-score TO_EQ_FM_HTML_DIRECT                  1.197 1.303 1.197 1.303
-score TO_EQ_FM_HTML_ONLY                    1.888 1.997 1.888 1.997
-score TO_EQ_FM_SPF_FAIL                     0.001 0.078 0.001 0.078
-score TO_IN_SUBJ                            0.100 0.099 0.100 0.099
-score TO_NAME_SUBJ_NO_RDNS                  1.598 0.001 1.598 0.001
-score TO_NO_BRKTS_FROM_MSSP                 2.499 0.932 2.499 0.932
-score TO_NO_BRKTS_HTML_IMG                  0.689 1.699 0.689 1.699
+score TO_EQ_FM_DIRECT_MX                    1.546 2.497 1.546 2.497
+score TO_EQ_FM_DOM_HTML_IMG                 0.001 0.535 0.001 0.535
+score TO_EQ_FM_DOM_HTML_ONLY                1.750 0.888 1.750 0.888
+score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
+score TO_EQ_FM_HTML_DIRECT                  0.274 0.001 0.274 0.001
+score TO_EQ_FM_HTML_ONLY                    2.099 1.294 2.099 1.294
+score TO_EQ_FM_SPF_FAIL                     0.001 0.084 0.001 0.084
+score TO_IN_SUBJ                            0.099 0.098 0.099 0.098
+score TO_NAME_SUBJ_NO_RDNS                  1.593 2.235 1.593 2.235
+score TO_NO_BRKTS_FROM_MSSP                 2.486 0.947 2.486 0.947
+score TO_NO_BRKTS_HTML_IMG                  1.198 1.783 1.198 1.783
 score TO_NO_BRKTS_HTML_ONLY                 1.999 1.997 1.999 1.997
-score TO_NO_BRKTS_MSFT                      2.500 1.020 2.500 1.020
-score TO_NO_BRKTS_NORDNS_HTML               0.285 0.044 0.285 0.044
+score TO_NO_BRKTS_MSFT                      2.499 1.021 2.499 1.021
+score TO_NO_BRKTS_NORDNS_HTML               0.592 0.151 0.592 0.151
 score TO_NO_BRKTS_PCNT                      2.500 2.497 2.500 2.497
-score TVD_RCVD_SPACE_BRACKET                2.756 0.994 2.756 0.994
-score TVD_SPACE_ENCODED                     0.550 0.001 0.550 0.001
-score TVD_SPACE_RATIO_MINFP                 2.444 1.998 2.444 1.998
+score TVD_RCVD_SPACE_BRACKET                2.763 1.841 2.763 1.841
+score TVD_SPACE_ENCODED                     0.551 0.001 0.551 0.001
+score TVD_SPACE_RATIO_MINFP                 2.499 2.396 2.499 2.396
 score TW_GIBBERISH_MANY                     1.000 1.000 1.000 1.000
 score UC_GIBBERISH_OBFU                     1.000 1.000 1.000 1.000
-score UNDISC_FREEM                          3.099 2.996 3.099 2.996
+score UNDISC_FREEM                          3.199 2.996 3.199 2.996
 score UNDISC_MONEY                          3.499 3.396 3.499 3.396
 score UNICODE_OBFU_ASC                      1.000 1.000 1.000 1.000
-score UNICODE_OBFU_ZW                       3.499 1.000 3.499 1.000
-score UPGRADE_MAILBOX                       1.299 0.001 1.299 0.001
+score UNICODE_OBFU_ZW                       1.000 1.000 1.000 1.000
+score UPGRADE_MAILBOX                       1.399 0.001 1.399 0.001
 score URI_ADOBESPARK                        1.000 1.000 1.000 1.000
 score URI_AZURE_CLOUDAPP                    1.000 1.000 1.000 1.000
-score URI_BUFFLY                            1.693 1.999 1.693 1.999
+score URI_BUFFLY                            1.999 1.725 1.999 1.725
 score URI_DASHGOVEDU                        1.000 1.000 1.000 1.000
 score URI_DATA                              1.000 1.000 1.000 1.000
-score URI_DEOBFU_INSTR                      3.599 3.595 3.599 3.595
-score URI_DOTDOT_LOW_CNTRST                 2.499 2.266 2.499 2.266
-score URI_DOTEDU                            1.938 1.476 1.938 1.476
+score URI_DEOBFU_INSTR                      3.700 3.595 3.700 3.595
+score URI_DOTDOT_LOW_CNTRST                 2.499 2.210 2.499 2.210
+score URI_DOTEDU                            1.999 1.160 1.999 1.160
 score URI_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
-score URI_DQ_UNSUB                          2.399 2.397 2.399 2.397
+score URI_DQ_UNSUB                          2.499 0.001 2.499 0.001
 score URI_FIREBASEAPP                       2.999 2.996 2.999 2.996
-score URI_GOOGLE_PROXY                      2.999 2.396 2.999 2.396
-score URI_GOOG_STO_SPAMMY                   2.977 1.367 2.977 1.367
+score URI_GOOGLE_PROXY                      2.999 2.230 2.999 2.230
+score URI_GOOG_STO_SPAMMY                   2.523 2.306 2.523 2.306
 score URI_HEX_IP                            1.000 1.000 1.000 1.000
 score URI_IMG_WP_REDIR                      1.000 1.000 1.000 1.000
-score URI_LONG_REPEAT                       0.924 1.718 0.924 1.718
-score URI_ONLY_MSGID_MALF                   0.001 0.001 0.001 0.001
+score URI_LONG_REPEAT                       0.692 1.346 0.692 1.346
+score URI_ONLY_MSGID_MALF                   0.535 0.001 0.535 0.001
 score URI_OPTOUT_3LD                        1.000 1.000 1.000 1.000
-score URI_PHISH                             3.004 1.947 3.004 1.947
+score URI_PHISH                             2.788 2.044 2.788 2.044
 score URI_PHP_REDIR                         3.500 3.496 3.500 3.496
 score URI_TRY_3LD                           1.999 1.997 1.999 1.997
 score URI_TRY_USME                          1.000 1.000 1.000 1.000
-score URI_WPADMIN                           2.699 2.597 2.699 2.597
-score URI_WP_DIRINDEX                       2.547 3.496 2.547 3.496
+score URI_WPADMIN                           2.699 2.596 2.699 2.596
+score URI_WP_DIRINDEX                       3.499 3.496 3.499 3.496
 score URI_WP_HACKED                         3.499 3.496 3.499 3.496
 score URI_WP_HACKED_2                       2.499 2.497 2.499 2.497
 score USB_DRIVES                            1.000 1.000 1.000 1.000
-score VFY_ACCT_NORDNS                       1.998 2.996 1.998 2.996
+score VFY_ACCT_NORDNS                       1.997 2.996 1.997 2.996
 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 WANT_TO_ORDER                         1.852 1.848 1.852 1.848
-score WIKI_IMG                              3.000 3.009 3.000 3.009
+score WANT_TO_ORDER                         2.053 1.660 2.053 1.660
+score WIKI_IMG                              3.001 3.090 3.001 3.090
 score WORD_INVIS                            1.000 1.000 1.000 1.000
 score WORD_INVIS_MANY                       2.999 2.996 2.999 2.996
-score XFER_LOTSA_MONEY                      0.999 0.001 0.999 0.001
-score XM_DIGITS_ONLY                        3.000 2.999 3.000 2.999
-score XM_LIGHT_HEAVY                        2.391 2.497 2.391 2.497
-score XM_LONG_DUP_TO                        3.799 3.433 3.799 3.433
-score XM_RANDOM                             2.500 2.497 2.500 2.497
+score XFER_LOTSA_MONEY                      1.000 0.001 1.000 0.001
+score XM_DIGITS_ONLY                        3.000 2.632 3.000 2.632
+score XM_LIGHT_HEAVY                        2.395 2.497 2.395 2.497
+score XM_LONG_DUP_TO                        3.899 3.273 3.899 3.273
+score XM_RANDOM                             2.499 2.497 2.499 2.497
 score XM_RECPTID                            2.999 2.996 2.999 2.996
 score XPRIO                                 0.001 1.000 0.001 1.000
 score XPRIO_SHORT_SUBJ                      1.000 1.000 1.000 1.000
-score YOUR_DELIVERY_ADDRESS                 1.032 1.248 1.032 1.248
-score YOU_INHERIT                           1.279 2.397 1.279 2.397
+score YOUR_DELIVERY_ADDRESS                 1.249 1.248 1.249 1.248
+score YOU_INHERIT                           0.689 2.397 0.689 2.397
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index 4300b20..6690170 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,96 +1,97 @@
-# Using score set 0 logs for revision 1889443 from:
-# ham-axb-coi-bulk.r1889443.log ham-axb-generic.r1889443.log ham-axb-ham-misc.r1889443.log ham-darxus.r1889443.log ham-ena-week0.r1889443.log ham-ena-week1.r1889443.log ham-ena-week2.r1889443.log ham-ena-week3.r1889443.log ham-ena-week4.r1889443.log ham-giovanni-ham.r1889443.log ham-giovanni-spammy.r1889443.log ham-giovanni-spam.r1889443.log ham-grenier.r1889443.log ham-hege.r1889443.log ham-jhardin.r1889443.log ham-llanga.r1889443.log ham-mmiroslaw-mails-ham.r1889443.log ham-mmiroslaw-mails-spam.r1889443.log ham-pds.r1889443.log ham-sihde.r1889443.log ham-spamsponge.r1889443.log ham-thendrikx.r1889443.log spam-axb-coi-bulk.r1889443.log spam-axb-generic.r1889443.log spam-axb-ham-misc.r1889443.log spam-darxus.r1889443.log spam-ena-week0.r1889443.log spam-ena-week1.r1889443.log spam-ena-week2.r1889443.log spam-ena-week3.r1889443.log spam-ena-week4.r1889443.log spam-giovanni-ham.r1889443.log spam-giovanni-spammy.r1889443.log spam-giovanni-spam.r1889443.log spam-grenier.r1889443.log spam-hege.r1889443.log spam-jhardin.r1889443.log spam-llanga.r1889443.log spam-mmiroslaw-mails-ham.r1889443.log spam-mmiroslaw-mails-spam.r1889443.log spam-pds.r1889443.log spam-sihde.r1889443.log spam-spamsponge.r1889443.log spam-thendrikx.r1889443.log
+# Using score set 0 logs for revision 1889478 from:
+# ham-axb-coi-bulk.r1889478.log ham-axb-generic.r1889478.log ham-axb-ham-misc.r1889478.log ham-darxus.r1889478.log ham-ena-week0.r1889478.log ham-ena-week1.r1889478.log ham-ena-week2.r1889478.log ham-ena-week3.r1889478.log ham-ena-week4.r1889478.log ham-giovanni-ham.r1889478.log ham-giovanni-spammy.r1889478.log ham-giovanni-spam.r1889478.log ham-grenier.r1889478.log ham-hege.r1889478.log ham-jhardin.r1889478.log ham-llanga.r1889478.log ham-mmiroslaw-mails-ham.r1889478.log ham-mmiroslaw-mails-spam.r1889478.log ham-pds.r1889478.log ham-sihde.r1889478.log ham-spamsponge.r1889478.log ham-thendrikx.r1889478.log spam-axb-coi-bulk.r1889478.log spam-axb-generic.r1889478.log spam-axb-ham-misc.r1889478.log spam-darxus.r1889478.log spam-ena-week0.r1889478.log spam-ena-week1.r1889478.log spam-ena-week2.r1889478.log spam-ena-week3.r1889478.log spam-ena-week4.r1889478.log spam-giovanni-ham.r1889478.log spam-giovanni-spammy.r1889478.log spam-giovanni-spam.r1889478.log spam-grenier.r1889478.log spam-hege.r1889478.log spam-jhardin.r1889478.log spam-llanga.r1889478.log spam-mmiroslaw-mails-ham.r1889478.log spam-mmiroslaw-mails-spam.r1889478.log spam-pds.r1889478.log spam-sihde.r1889478.log spam-spamsponge.r1889478.log spam-thendrikx.r1889478.log
 
 score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.999
 score AC_HTML_NONSENSE_TAGS          1.999
-score ADMITS_SPAM                    4.000
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.989
-score ADVANCE_FEE_2_NEW_MONEY        1.265
-score ADVANCE_FEE_3_NEW              2.401
-score ADVANCE_FEE_3_NEW_FRM_MNY      0.866
-score ADVANCE_FEE_3_NEW_MONEY        0.001
-score ADVANCE_FEE_4_NEW              2.040
+score ADMITS_SPAM                    3.999
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
+score ADVANCE_FEE_2_NEW_MONEY        1.276
+score ADVANCE_FEE_3_NEW              2.500
+score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
+score ADVANCE_FEE_3_NEW_MONEY        1.026
+score ADVANCE_FEE_4_NEW              2.058
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        2.670
-score ADVANCE_FEE_5_NEW              2.285
-score ADVANCE_FEE_5_NEW_FRM_MNY      2.899
-score ADVANCE_FEE_5_NEW_MONEY        0.001
+score ADVANCE_FEE_4_NEW_MONEY        3.099
+score ADVANCE_FEE_5_NEW              2.899
+score ADVANCE_FEE_5_NEW_FRM_MNY      2.999
+score ADVANCE_FEE_5_NEW_MONEY        1.383
 score AD_PREFS                       0.499
 score ALIBABA_IMG_NOT_RCVD_ALI       2.499
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         1.221
+score APP_DEVELOPMENT_NORDNS         1.215
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.973
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.648
 score BIGNUM_EMAILS_FREEM            2.999
-score BITCOIN_DEADLINE               2.271
-score BITCOIN_EXTORT_01              4.692
-score BITCOIN_IMGUR                  3.226
+score BITCOIN_DEADLINE               2.570
+score BITCOIN_IMGUR                  2.581
 score BITCOIN_MALF_HTML              3.499
-score BITCOIN_MALWARE                2.104
-score BITCOIN_ONAN                   2.408
-score BITCOIN_SPAM_02                1.494
-score BITCOIN_SPAM_03                2.499
+score BITCOIN_MALWARE                2.057
+score BITCOIN_ONAN                   2.474
+score BITCOIN_SPAM_02                2.043
+score BITCOIN_SPAM_03                0.001
+score BITCOIN_SPAM_07                2.840
 score BITCOIN_XPRIO                  0.001
-score BITCOIN_YOUR_INFO              2.231
-score BODY_SINGLE_URI                2.499
+score BITCOIN_YOUR_INFO              1.931
+score BODY_SINGLE_URI                0.660
 score BODY_SINGLE_WORD               0.001
-score BODY_URI_ONLY                  2.601
+score BODY_URI_ONLY                  1.955
 score BOGUS_MIME_VERSION             3.499
 score CK_HELO_GENERIC                0.250
 score COMPENSATION                   1.499
 score CONTENT_AFTER_HTML             2.499
 score CTE_8BIT_MISMATCH              0.999
-score DATE_IN_FUTURE_96_Q            0.095
-score DEAR_BENEFICIARY               0.690
+score DATE_IN_FUTURE_96_Q            1.003
+score DEAR_BENEFICIARY               0.010
 score DSN_NO_MIMEVERSION             1.999
-score EBAY_IMG_NOT_RCVD_EBAY         0.828
+score EBAY_IMG_NOT_RCVD_EBAY         0.654
 score END_FUTURE_EMAILS              2.499
-score FAKE_REPLY_A1                  2.159
-score FAKE_REPLY_B                   1.552
-score FBI_MONEY                      1.049
-score FBI_SPOOF                      1.584
-score FILL_THIS_FORM                 1.200
+score FAKE_REPLY_A1                  3.299
+score FBI_MONEY                      1.067
+score FBI_SPOOF                      1.836
+score FILL_THIS_FORM                 1.199
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           1.187
+score FONT_INVIS_LONG_LINE           2.234
 score FONT_INVIS_MSGID               2.499
-score FONT_INVIS_NORDNS              1.781
+score FONT_INVIS_NORDNS              1.700
 score FORM_FRAUD                     0.001
-score FORM_FRAUD_3                   3.099
-score FORM_FRAUD_5                   2.645
+score FORM_FRAUD_3                   3.199
+score FORM_FRAUD_5                   2.045
 score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.250
+score FREEMAIL_FORGED_FROMDOMAIN     0.249
 score FROMSPACE                      3.399
 score FROM_2_EMAILS_SHORT            2.999
-score FROM_IN_TO_AND_SUBJ            2.599
+score FROM_IN_TO_AND_SUBJ            2.699
 score FROM_MISSPACED                 0.001
 score FROM_MISSP_DYNIP               0.001
 score FROM_MISSP_EH_MATCH            0.001
 score FROM_MISSP_FREEMAIL            2.898
-score FROM_MISSP_MSFT                1.873
-score FROM_MISSP_PHISH               0.952
-score FROM_MISSP_REPLYTO             2.397
+score FROM_MISSP_MSFT                2.256
+score FROM_MISSP_PHISH               3.499
+score FROM_MISSP_REPLYTO             2.413
 score FROM_MISSP_TO_UNDISC           0.001
 score FROM_MISSP_USER                0.001
 score FROM_MULTI_NORDNS              0.001
-score FROM_NTLD_REPLY_FREEMAIL       1.785
+score FROM_NTLD_REPLY_FREEMAIL       1.549
 score FROM_SUSPICIOUS_NTLD           0.500
-score FROM_SUSPICIOUS_NTLD_FP        2.000
+score FROM_SUSPICIOUS_NTLD_FP        1.999
+score FROM_WSP_TRAIL                 2.699
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.799
 score GB_FAKE_RF_SHORT               1.999
-score GB_FREEMAIL_DISPTO             0.487
-score GOOGLE_DOC_SUSP                2.999
+score GB_FREEMAIL_DISPTO             0.499
+score GOOGLE_DOC_SUSP                3.000
 score GOOG_REDIR_NORDNS              2.498
-score GOOG_STO_EMAIL_PHISH           2.113
-score GOOG_STO_HTML_PHISH            2.071
+score GOOG_STO_EMAIL_PHISH           2.205
+score GOOG_STO_HTML_PHISH            2.475
+score GOOG_STO_HTML_PHISH_MANY       1.610
 score GOOG_STO_IMG_HTML              2.999
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       1.674
+score HAS_X_OUTGOING_SPAM_STAT       1.999
 score HDRS_LCASE                     0.100
 score HDRS_LCASE_IMGONLY             0.100
 score HDRS_MISSP                     2.499
@@ -99,171 +100,170 @@
 score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.999
-score HK_NAME_FM_MR_MRS              0.678
+score HK_NAME_FM_MR_MRS              0.550
 score HK_NAME_MR_MRS                 0.999
-score HK_RANDOM_ENVFROM              0.999
+score HK_RANDOM_ENVFROM              1.000
 score HK_RANDOM_FROM                 0.999
 score HK_RANDOM_REPLYTO              0.999
-score HK_SCAM                        1.364
-score HOSTED_IMG_DIRECT_MX           2.705
+score HK_SCAM                        1.999
+score HOSTED_IMG_DIRECT_MX           3.174
 score HOSTED_IMG_FREEM               3.499
-score HOSTED_IMG_MULTI               2.259
+score HOSTED_IMG_MULTI               1.752
 score HOSTED_IMG_MULTI_PUB_01        2.999
 score HTML_ENTITY_ASCII              2.999
 score HTML_OFF_PAGE                  2.999
 score HTML_SINGLET_MANY              0.001
-score HTML_TAG_BALANCE_CENTER        2.692
-score HTML_TEXT_INVISIBLE_FONT       1.187
-score HTML_TEXT_INVISIBLE_STYLE      1.491
+score HTML_TAG_BALANCE_CENTER        3.284
+score HTML_TEXT_INVISIBLE_FONT       1.184
+score HTML_TEXT_INVISIBLE_STYLE      0.901
 score JH_SPAMMY_HEADERS              3.499
 score KHOP_FAKE_EBAY                 0.001
 score KHOP_HELO_FCRDNS               0.400
 score LIST_PRTL_SAME_USER            0.001
-score LONG_HEX_URI                   2.599
-score LONG_IMG_URI                   1.273
-score LONG_INVISIBLE_TEXT            2.999
+score LONG_HEX_URI                   2.600
+score LONG_IMG_URI                   0.492
+score LONG_INVISIBLE_TEXT            1.954
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.500
-score LOTTO_DEPT                     0.735
-score MALWARE_NORDNS                 0.001
-score MANY_SPAN_IN_TEXT              2.699
-score MAY_BE_FORGED                  2.092
-score MILLION_HUNDRED                0.001
-score MILLION_USD                    0.048
-score MIMEOLE_DIRECT_TO_MX           0.375
-score MIXED_AREA_CASE                2.499
-score MIXED_CENTER_CASE              1.243
-score MIXED_CTYPE_CASE               2.083
-score MIXED_ES                       3.199
+score LOTTO_AGENT                    1.499
+score LOTTO_DEPT                     0.001
+score MALWARE_NORDNS                 0.045
+score MANY_SPAN_IN_TEXT              2.799
+score MAY_BE_FORGED                  2.090
+score MILLION_HUNDRED                0.001 # force non-zero
+score MILLION_USD                    0.601
+score MIMEOLE_DIRECT_TO_MX           0.001
+score MIXED_AREA_CASE                0.001
+score MIXED_CENTER_CASE              1.242
+score MIXED_CTYPE_CASE               1.061
+score MIXED_ES                       3.299
 score MIXED_FONT_CASE                0.001
 score MIXED_HREF_CASE                1.999
 score MIXED_IMG_CASE                 2.999
 score MONEY_ATM_CARD                 0.001
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               2.204
-score MONEY_FRAUD_3                  2.774
-score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  3.364
-score MONEY_FREEMAIL_REPTO           3.000
+score MONEY_FORM_SHORT               1.953
+score MONEY_FRAUD_3                  3.057
+score MONEY_FRAUD_5                  2.443
+score MONEY_FRAUD_8                  1.039
+score MONEY_FREEMAIL_REPTO           2.999
 score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   2.499
-score MSGID_HDR_MALF                 2.989
-score MSGID_NOFQDN1                  0.486
+score MONEY_NOHTML                   2.500
+score MSGID_HDR_MALF                 2.807
+score MSGID_NOFQDN1                  0.999
 score MSMAIL_PRI_ABNORMAL            0.001
-score MSM_PRIO_REPTO                 0.001
 score NA_DOLLARS                     1.499
 score NICE_REPLY_A                   -0.001
-score NORDNS_LOW_CONTRAST            1.881
+score NORDNS_LOW_CONTRAST            1.878
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.001
+score NUMBEREND_LINKBAIT             0.649
 score ODD_FREEM_REPTO                2.999
-score OFFER_ONLY_AMERICA             1.268
-score ONLINE_MKTG_CNSLT              2.700
+score OFFER_ONLY_AMERICA             1.313
+score ONLINE_MKTG_CNSLT              2.799
 score PDS_BAD_THREAD_QP_64           0.999
 score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.001
-score PDS_DBL_URL_TNB_RUNON          0.158
+score PDS_DBL_URL_TNB_RUNON          1.403
 score PDS_EMPTYSUBJ_URISHRT          1.499
-score PDS_FRNOM_TODOM_DBL_URL        1.487
+score PDS_FRNOM_TODOM_DBL_URL        1.468
 score PDS_FRNOM_TODOM_NAKED_TO       1.499
-score PDS_FROM_2_EMAILS              3.132
-score PDS_FROM_2_EMAILS_SHRTNER      1.412
+score PDS_FROM_2_EMAILS              3.136
+score PDS_FROM_2_EMAILS_SHRTNER      0.271
 score PDS_FROM_NAME_TO_DOMAIN        1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL   0.175
-score PDS_OTHER_BAD_TLD              1.999
+score PDS_NO_FULL_NAME_SPOOFED_URL   0.749
+score PDS_OTHER_BAD_TLD              2.000
 score PDS_PRO_TLD                    0.999
 score PDS_SHORTFWD_URISHRT_FP        1.499
-score PDS_SHORT_SPOOFED_URL          1.093
-score PDS_TINYSUBJ_URISHRT           1.103
+score PDS_SHORT_SPOOFED_URL          1.999
+score PDS_TINYSUBJ_URISHRT           0.837
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
 score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
 score PDS_TONAME_EQ_TOLOCAL_SHORT    1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.999
-score PHISH_FBASEAPP                 1.881
-score PHP_ORIG_SCRIPT                2.297
-score PHP_SCRIPT                     2.453
+score PDS_TONAME_EQ_TOLOCAL_VSHORT   1.000
+score PHISH_FBASEAPP                 0.001
+score PHP_ORIG_SCRIPT                2.251
+score PHP_SCRIPT                     2.499
 score PP_MIME_FAKE_ASCII_TEXT        0.999
 score RAND_HEADER_LIST_SPOOF         2.999
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                0.104
-score RCVD_DOTEDU_SUSP_URI           3.000
-score RDNS_NUM_TLD_XM                2.996
+score RATWARE_NO_RDNS                2.676
+score RCVD_DOTEDU_SUSP_URI           2.999
+score RDNS_NUM_TLD_XM                1.528
 score READY_TO_SHIP                  1.249
-score REPTO_419_FRAUD                2.416
+score REPLYTO_EMPTY                  1.935
+score REPTO_419_FRAUD                2.097
 score REPTO_419_FRAUD_GM             2.999
 score REPTO_419_FRAUD_QQ             2.999
-score REPTO_419_FRAUD_YJ             0.001
-score RISK_FREE                      1.998
-score SENDGRID_REDIR                 1.499
+score REPTO_419_FRAUD_YJ             1.570
+score RISK_FREE                      3.099
+score SENDGRID_REDIR                 1.500
 score SEO_SUSP_NTLD                  1.199
-score SERGIO_SUBJECT_VIAGRA01        3.277
+score SERGIO_SUBJECT_VIAGRA01        3.976
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
 score SHORTENER_SHORT_SUBJ           2.999
-score SHORT_IMG_SUSP_NTLD            0.313
+score SHORT_IMG_SUSP_NTLD            0.943
 score SHORT_SHORTNER                 1.999
 score SINGLETS_LOW_CONTRAST          0.001
 score SPOOFED_FREEMAIL_NO_RDNS       1.499
 score SPOOF_GMAIL_MID                1.499
-score STATIC_XPRIO_OLE               1.623
-score STOCK_LOW_CONTRAST             2.499
+score STATIC_XPRIO_OLE               1.999
+score STOCK_LOW_CONTRAST             1.949
 score SUSP_UTF8_WORD_SUBJ            1.999
-score THIS_AD                        1.399
+score THIS_AD                        1.499
 score THIS_IS_ADV_SUSP_NTLD          1.499
-score THREAD_INDEX_HEX               1.039
+score THREAD_INDEX_HEX               1.202
 score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.499
-score TO_EQ_FM_DIRECT_MX             0.833
+score TO_EQ_FM_DIRECT_MX             1.546
 score TO_EQ_FM_DOM_HTML_IMG          0.001
-score TO_EQ_FM_DOM_HTML_ONLY         1.306
-score TO_EQ_FM_HTML_DIRECT           1.197
-score TO_EQ_FM_HTML_ONLY             1.888
-score TO_IN_SUBJ                     0.100
-score TO_NAME_SUBJ_NO_RDNS           1.598
-score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           0.689
+score TO_EQ_FM_DOM_HTML_ONLY         1.750
+score TO_EQ_FM_HTML_DIRECT           0.274
+score TO_EQ_FM_HTML_ONLY             2.099
+score TO_IN_SUBJ                     0.099
+score TO_NAME_SUBJ_NO_RDNS           1.593
+score TO_NO_BRKTS_FROM_MSSP          2.486
+score TO_NO_BRKTS_HTML_IMG           1.198
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               2.500
-score TO_NO_BRKTS_NORDNS_HTML        0.285
+score TO_NO_BRKTS_MSFT               2.499
+score TO_NO_BRKTS_NORDNS_HTML        0.592
 score TO_NO_BRKTS_PCNT               2.500
-score TVD_RCVD_SPACE_BRACKET         2.756
-score TVD_SPACE_ENCODED              0.550
-score TVD_SPACE_RATIO_MINFP          2.444
-score UNDISC_FREEM                   3.099
+score TVD_RCVD_SPACE_BRACKET         2.763
+score TVD_SPACE_ENCODED              0.551
+score TVD_SPACE_RATIO_MINFP          2.499
+score UNDISC_FREEM                   3.199
 score UNDISC_MONEY                   3.499
-score UNICODE_OBFU_ZW                3.499
-score UPGRADE_MAILBOX                1.299
-score URI_BUFFLY                     1.693
-score URI_DEOBFU_INSTR               3.599
+score UPGRADE_MAILBOX                1.399
+score URI_BUFFLY                     1.999
+score URI_DEOBFU_INSTR               3.700
 score URI_DOTDOT_LOW_CNTRST          2.499
-score URI_DOTEDU                     1.938
-score URI_DQ_UNSUB                   2.399
+score URI_DOTEDU                     1.999
+score URI_DQ_UNSUB                   2.499
 score URI_FIREBASEAPP                2.999
 score URI_GOOGLE_PROXY               2.999
-score URI_GOOG_STO_SPAMMY            2.977
-score URI_LONG_REPEAT                0.924
-score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      3.004
+score URI_GOOG_STO_SPAMMY            2.523
+score URI_LONG_REPEAT                0.692
+score URI_ONLY_MSGID_MALF            0.535
+score URI_PHISH                      2.788
 score URI_PHP_REDIR                  3.500
 score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.699
-score URI_WP_DIRINDEX                2.547
+score URI_WP_DIRINDEX                3.499
 score URI_WP_HACKED                  3.499
 score URI_WP_HACKED_2                2.499
-score VFY_ACCT_NORDNS                1.998
-score WANT_TO_ORDER                  1.852
-score WIKI_IMG                       3.000
+score VFY_ACCT_NORDNS                1.997
+score WANT_TO_ORDER                  2.053
+score WIKI_IMG                       3.001
 score WORD_INVIS_MANY                2.999
-score XFER_LOTSA_MONEY               0.999
+score XFER_LOTSA_MONEY               1.000
 score XM_DIGITS_ONLY                 3.000
-score XM_LIGHT_HEAVY                 2.391
-score XM_LONG_DUP_TO                 3.799
-score XM_RANDOM                      2.500
+score XM_LIGHT_HEAVY                 2.395
+score XM_LONG_DUP_TO                 3.899
+score XM_RANDOM                      2.499
 score XM_RECPTID                     2.999
 score XPRIO                          0.001
-score YOUR_DELIVERY_ADDRESS          1.032
-score YOU_INHERIT                    1.279
+score YOUR_DELIVERY_ADDRESS          1.249
+score YOU_INHERIT                    0.689
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -279,13 +279,13 @@
 score APP_DEVELOPMENT_FREEM          1.000
 score BIGNUM_EMAILS_MANY             1.000
 score BITCOIN_BOMB                   1.000
+score BITCOIN_EXTORT_01              1.000
 score BITCOIN_EXTORT_02              1.000
 score BITCOIN_OBFU_SUBJ              1.000
 score BITCOIN_PAY_ME                 1.000
 score BITCOIN_SPAM_01                1.000
 score BITCOIN_SPAM_04                1.000
 score BITCOIN_SPAM_06                1.000
-score BITCOIN_SPAM_07                1.000
 score BITCOIN_SPAM_08                1.000
 score BITCOIN_SPAM_09                1.000
 score BITCOIN_SPAM_10                1.000
@@ -319,7 +319,6 @@
 score GOOGLE_DOCS_PHISH_MANY         1.000
 score GOOGLE_DRIVE_REPLY_BAD_NTLD    1.000
 score GOOG_MALWARE_DNLD              1.000
-score GOOG_STO_HTML_PHISH_MANY       1.000
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 1.000
 score HEXHASH_WORD                   1.000
@@ -343,9 +342,9 @@
 score MONERO_MALWARE                 1.000
 score MONERO_PAY_ME                  1.000
 score MSGID_DOLLARS_URI_IMG          1.000
+score MSM_PRIO_REPTO                 1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
-score ORDER_TODAY                    1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHOTO_EDITING_DIRECT           1.000
 score PHOTO_EDITING_FREEM            1.000
@@ -376,6 +375,7 @@
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ASC               1.000
+score UNICODE_OBFU_ZW                1.000
 score URI_ADOBESPARK                 1.000
 score URI_AZURE_CLOUDAPP             1.000
 score URI_DASHGOVEDU                 1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index a0ca7b2..ea4076b 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -1,10 +1,10 @@
 # Using score set 1 logs for revision 1889355 from:
 # ham-net-axb-coi-bulk.r1889355.log ham-net-axb-generic.r1889355.log ham-net-axb-ham-misc.r1889355.log ham-net-darxus.r1889355.log ham-net-ena-week0.r1889355.log ham-net-ena-week1.r1889355.log ham-net-ena-week2.r1889355.log ham-net-ena-week3.r1889355.log ham-net-ena-week4.r1889355.log ham-net-grenier.r1889355.log ham-net-hege.r1889355.log ham-net-jhardin.r1889355.log ham-net-llanga.r1889355.log ham-net-mmiroslaw-mails-ham.r1889355.log ham-net-mmiroslaw-mails-spam.r1889355.log ham-net-pds.r1889355.log ham-net-sihde.r1889355.log ham-net-spamsponge.r1889355.log ham-net-thendrikx.r1889355.log spam-net-axb-coi-bulk.r1889355.log spam-net-axb-generic.r1889355.log spam-net-axb-ham-misc.r1889355.log spam-net-darxus.r1889355.log spam-net-ena-week0.r1889355.log spam-net-ena-week1.r1889355.log spam-net-ena-week2.r1889355.log spam-net-ena-week3.r1889355.log spam-net-ena-week4.r1889355.log spam-net-grenier.r1889355.log spam-net-hege.r1889355.log spam-net-jhardin.r1889355.log spam-net-llanga.r1889355.log spam-net-mmiroslaw-mails-ham.r1889355.log spam-net-mmiroslaw-mails-spam.r1889355.log spam-net-pds.r1889355.log spam-net-sihde.r1889355.log spam-net-spamsponge.r1889355.log spam-net-thendrikx.r1889355.log
 
-score ACCT_PHISHING_MANY             0.376
+score ACCT_PHISHING_MANY             0.427
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_FROM_MANY_DOTS              2.997
+score AC_FROM_MANY_DOTS              2.996
 score AC_HTML_NONSENSE_TAGS          1.997
 score ADMITS_SPAM                    3.895
 score ADVANCE_FEE_2_NEW_FRM_MNY      0.001
@@ -12,62 +12,62 @@
 score ADVANCE_FEE_3_NEW              3.496
 score ADVANCE_FEE_3_NEW_FRM_MNY      2.497
 score ADVANCE_FEE_3_NEW_MONEY        0.001
-score ADVANCE_FEE_4_NEW              0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        2.090
-score ADVANCE_FEE_5_NEW              2.492
+score ADVANCE_FEE_4_NEW              2.497
+score ADVANCE_FEE_4_NEW_FRM_MNY      0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY        2.107
+score ADVANCE_FEE_5_NEW              2.570
 score ADVANCE_FEE_5_NEW_FRM_MNY      2.796
-score ADVANCE_FEE_5_NEW_MONEY        1.682
+score ADVANCE_FEE_5_NEW_MONEY        3.196
 score AD_PREFS                       0.498
-score ALIBABA_IMG_NOT_RCVD_ALI       2.166
+score ALIBABA_IMG_NOT_RCVD_ALI       2.277
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         0.813
+score APP_DEVELOPMENT_NORDNS         0.814
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.803
-score BIGNUM_EMAILS_FREEM            2.469
-score BITCOIN_DEADLINE               2.720
-score BITCOIN_EXTORT_01              4.764
-score BITCOIN_IMGUR                  3.496
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.797
+score BIGNUM_EMAILS_FREEM            1.948
+score BITCOIN_DEADLINE               1.814
+score BITCOIN_EXTORT_01              3.083
+score BITCOIN_IMGUR                  3.356
 score BITCOIN_MALF_HTML              3.496
-score BITCOIN_MALWARE                1.494
+score BITCOIN_MALWARE                1.322
 score BITCOIN_ONAN                   2.996
 score BITCOIN_SPAM_02                2.497
-score BITCOIN_SPAM_03                2.497
-score BITCOIN_SPAM_05                0.001 # force non-zero
-score BITCOIN_XPRIO                  0.004
-score BITCOIN_YOUR_INFO              1.777
+score BITCOIN_SPAM_03                0.001
+score BITCOIN_SPAM_05                0.001
+score BITCOIN_XPRIO                  0.001
+score BITCOIN_YOUR_INFO              2.681
 score BODY_SINGLE_URI                2.497
 score BODY_SINGLE_WORD               0.001
-score BODY_URI_ONLY                  1.525
-score BOGUS_MIME_VERSION             2.550
-score CK_HELO_GENERIC                0.001
+score BODY_URI_ONLY                  1.536
+score BOGUS_MIME_VERSION             1.890
+score CK_HELO_GENERIC                0.001 # force non-zero
 score CONTENT_AFTER_HTML             2.497
-score CTE_8BIT_MISMATCH              0.838
-score DATE_IN_FUTURE_96_Q            1.845
-score DEAR_BENEFICIARY               0.001
+score CTE_8BIT_MISMATCH              0.837
+score DATE_IN_FUTURE_96_Q            2.037
+score DEAR_BENEFICIARY               3.196
 score DKIMWL_BL                      2.996
-score DKIMWL_WL_HIGH                 -0.697
-score DKIMWL_WL_MED                  -0.001 # force non-zero
+score DKIMWL_WL_HIGH                 -0.693
+score DKIMWL_WL_MED                  -0.001
 score DKIMWL_WL_MEDHI                -0.001
 score DSN_NO_MIMEVERSION             1.997
-score EBAY_IMG_NOT_RCVD_EBAY         1.484
-score FAKE_REPLY_A1                  2.747
-score FAKE_REPLY_B                   2.110
-score FBI_MONEY                      0.755
-score FBI_SPOOF                      1.343
-score FILL_THIS_FORM                 0.001
-score FONT_INVIS_DIRECT              1.392
-score FONT_INVIS_HTML_NOHTML         2.846
-score FONT_INVIS_LONG_LINE           2.997
-score FONT_INVIS_MSGID               1.722
+score EBAY_IMG_NOT_RCVD_EBAY         2.999
+score FAKE_REPLY_A1                  2.727
+score FAKE_REPLY_B                   2.210
+score FBI_MONEY                      0.043
+score FBI_SPOOF                      1.999
+score FILL_THIS_FORM                 0.001 # force non-zero
+score FONT_INVIS_DIRECT              1.750
+score FONT_INVIS_HTML_NOHTML         2.379
+score FONT_INVIS_LONG_LINE           2.996
+score FONT_INVIS_MSGID               1.951
 score FONT_INVIS_NORDNS              2.497
-score FORGED_SPF_HELO                2.697
+score FORGED_SPF_HELO                2.696
 score FORM_FRAUD                     0.001
-score FORM_FRAUD_3                   0.839
-score FORM_FRAUD_5                   2.858
-score FOUND_YOU                      0.685
+score FORM_FRAUD_3                   1.357
+score FORM_FRAUD_5                   1.944
+score FOUND_YOU                      0.683
 score FREEMAIL_FORGED_FROMDOMAIN     0.248
-score FROMSPACE                      2.980
+score FROMSPACE                      3.296
 score FROM_2_EMAILS_SHORT            2.996
 score FROM_FMBLA_NEWDOM              1.498
 score FROM_FMBLA_NEWDOM14            0.998
@@ -76,146 +76,146 @@
 score FROM_GOV_SPOOF                 0.998
 score FROM_IN_TO_AND_SUBJ            2.497
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               0.136
+score FROM_MISSP_DYNIP               2.498
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            0.001
+score FROM_MISSP_FREEMAIL            0.001 # force non-zero
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_PHISH               0.001
 score FROM_MISSP_REPLYTO             2.497
-score FROM_MISSP_SPF_FAIL            0.874
+score FROM_MISSP_SPF_FAIL            0.876
 score FROM_MISSP_TO_UNDISC           0.001
 score FROM_MISSP_USER                0.001
 score FROM_MULTI_NORDNS              3.995
-score FROM_NEWDOM_BTC                1.122
-score FROM_NTLD_REPLY_FREEMAIL       0.409
-score FROM_PAYPAL_SPOOF              0.071
+score FROM_NEWDOM_BTC                1.999
+score FROM_NTLD_REPLY_FREEMAIL       0.685
+score FROM_PAYPAL_SPOOF              1.097
 score FROM_SUSPICIOUS_NTLD           0.498
 score FROM_SUSPICIOUS_NTLD_FP        1.997
 score FSL_BULK_SIG                   0.001
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.696
-score FUZZY_BITCOIN                  2.376
+score FUZZY_BITCOIN                  0.080
 score GB_FAKE_RF_SHORT               1.997
-score GB_FREEMAIL_DISPTO             0.498
+score GB_FREEMAIL_DISPTO             0.499
 score GOOGLE_DOC_SUSP                2.996
-score GOOG_REDIR_NORDNS              1.817
-score GOOG_STO_HTML_PHISH            1.587
+score GOOG_REDIR_NORDNS              1.878
+score GOOG_STO_HTML_PHISH            1.016
 score GOOG_STO_IMG_HTML              2.996
-score GOOG_STO_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       1.985
+score GOOG_STO_NOIMG_HTML            2.997
+score HAS_X_OUTGOING_SPAM_STAT       1.997
 score HDRS_LCASE                     0.098
-score HDRS_LCASE_IMGONLY             0.098
+score HDRS_LCASE_IMGONLY             0.099
 score HDRS_MISSP                     2.497
-score HDR_ORDER_FTSDMCXX_DIRECT      1.810
+score HDR_ORDER_FTSDMCXX_DIRECT      1.816
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.248
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.998
 score HK_NAME_FM_MR_MRS              1.498
 score HK_NAME_MR_MRS                 0.998
 score HK_RANDOM_ENVFROM              0.998
 score HK_RANDOM_FROM                 0.998
-score HK_RANDOM_REPLYTO              0.904
-score HK_SCAM                        0.001
-score HOSTED_IMG_DIRECT_MX           3.110
+score HK_RANDOM_REPLYTO              0.850
+score HK_SCAM                        0.731
+score HOSTED_IMG_DIRECT_MX           1.730
 score HOSTED_IMG_FREEM               3.496
-score HOSTED_IMG_MULTI               0.547
+score HOSTED_IMG_MULTI               0.834
 score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_ENTITY_ASCII              2.953
+score HTML_ENTITY_ASCII              2.940
 score HTML_OFF_PAGE                  2.996
-score HTML_SINGLET_MANY              1.161
-score HTML_TAG_BALANCE_CENTER        2.976
-score HTML_TEXT_INVISIBLE_FONT       0.827
-score HTML_TEXT_INVISIBLE_STYLE      1.923
+score HTML_SINGLET_MANY              1.391
+score HTML_TAG_BALANCE_CENTER        2.963
+score HTML_TEXT_INVISIBLE_FONT       0.496
+score HTML_TEXT_INVISIBLE_STYLE      1.931
 score JH_SPAMMY_HEADERS              3.496
 score KHOP_FAKE_EBAY                 1.198
 score KHOP_HELO_FCRDNS               0.398
-score LIST_PRTL_SAME_USER            0.687
+score LIST_PRTL_SAME_USER            0.901
 score LONG_HEX_URI                   0.001
-score LONG_IMG_URI                   0.939
-score LONG_INVISIBLE_TEXT            2.545
+score LONG_IMG_URI                   0.929
+score LONG_INVISIBLE_TEXT            2.302
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    1.498
 score LOTTO_DEPT                     0.001
 score MALWARE_NORDNS                 0.001
-score MANY_SPAN_IN_TEXT              2.696
-score MAY_BE_FORGED                  2.896
-score MILLION_HUNDRED                2.996
-score MILLION_USD                    0.978
+score MANY_SPAN_IN_TEXT              2.619
+score MAY_BE_FORGED                  1.136
+score MILLION_HUNDRED                0.001
+score MILLION_USD                    0.001
 score MIMEOLE_DIRECT_TO_MX           0.001
-score MIXED_AREA_CASE                2.031
-score MIXED_CENTER_CASE              1.953
-score MIXED_CTYPE_CASE               2.429
-score MIXED_ES                       2.596
-score MIXED_FONT_CASE                0.331
+score MIXED_AREA_CASE                1.547
+score MIXED_CENTER_CASE              1.727
+score MIXED_CTYPE_CASE               1.155
+score MIXED_ES                       2.594
+score MIXED_FONT_CASE                0.387
 score MIXED_HREF_CASE                1.997
 score MIXED_IMG_CASE                 2.996
 score MONEY_ATM_CARD                 0.001
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               1.698
-score MONEY_FRAUD_3                  2.623
+score MONEY_FORM_SHORT               1.432
+score MONEY_FRAUD_3                  2.798
 score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  1.296
-score MONEY_FREEMAIL_REPTO           0.987
+score MONEY_FRAUD_8                  0.543
+score MONEY_FREEMAIL_REPTO           1.084
 score MONEY_FROM_41                  1.997
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   2.498
+score MONEY_NOHTML                   2.497
 score MSGID_HDR_MALF                 3.496
-score MSGID_NOFQDN1                  2.758
-score MSMAIL_PRI_ABNORMAL            1.386
+score MSGID_NOFQDN1                  1.811
+score MSMAIL_PRI_ABNORMAL            0.478
 score MSM_PRIO_REPTO                 0.001
 score NA_DOLLARS                     1.498
 score NICE_REPLY_A                   -0.001
-score NORDNS_LOW_CONTRAST            2.269
+score NORDNS_LOW_CONTRAST            2.223
 score NO_FM_NAME_IP_HOSTN            0.001
-score NSL_RCVD_FROM_USER             0.001 # force non-zero
+score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.999
-score ODD_FREEM_REPTO                2.996
-score OFFER_ONLY_AMERICA             0.809
+score NUMBEREND_LINKBAIT             0.235
+score ODD_FREEM_REPTO                2.935
+score OFFER_ONLY_AMERICA             0.894
 score ONLINE_MKTG_CNSLT              2.696
 score PDS_BAD_THREAD_QP_64           0.998
 score PDS_BTC_ID                     0.498
-score PDS_BTC_MSGID                  0.001
+score PDS_BTC_MSGID                  0.179
 score PDS_DBL_URL_TNB_RUNON          0.001
 score PDS_EMPTYSUBJ_URISHRT          0.001
-score PDS_FRNOM_TODOM_DBL_URL        1.498
-score PDS_FRNOM_TODOM_NAKED_TO       1.122
-score PDS_FROM_2_EMAILS              3.371
-score PDS_FROM_2_EMAILS_SHRTNER      0.867
-score PDS_FROM_NAME_TO_DOMAIN        1.550
-score PDS_NO_FULL_NAME_SPOOFED_URL   0.535
+score PDS_FRNOM_TODOM_DBL_URL        1.497
+score PDS_FRNOM_TODOM_NAKED_TO       0.689
+score PDS_FROM_2_EMAILS              2.652
+score PDS_FROM_2_EMAILS_SHRTNER      0.249
+score PDS_FROM_NAME_TO_DOMAIN        1.836
+score PDS_NO_FULL_NAME_SPOOFED_URL   0.718
 score PDS_OTHER_BAD_TLD              1.997
 score PDS_PRO_TLD                    0.998
-score PDS_SHORTFWD_URISHRT_FP        1.499
-score PDS_SHORT_SPOOFED_URL          1.714
+score PDS_SHORTFWD_URISHRT_FP        1.498
+score PDS_SHORT_SPOOFED_URL          0.806
 score PDS_TINYSUBJ_URISHRT           0.001
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.001
 score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.997
 score PDS_TONAME_EQ_TOLOCAL_SHORT    1.997
-score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.999
-score PHISH_FBASEAPP                 2.494
+score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.998
+score PHISH_FBASEAPP                 2.976
 score PHP_ORIG_SCRIPT                0.001
-score PHP_SCRIPT                     0.308
-score PP_MIME_FAKE_ASCII_TEXT        0.807
+score PHP_SCRIPT                     0.815
+score PP_MIME_FAKE_ASCII_TEXT        0.842
 score RAND_HEADER_LIST_SPOOF         2.996
 score RAND_MKTG_HEADER               1.997
-score RATWARE_NO_RDNS                2.999
+score RATWARE_NO_RDNS                1.353
 score RCVD_DOTEDU_SUSP_URI           2.996
 score RCVD_IN_MSPIKE_H2              -0.001
 score READY_TO_SHIP                  1.248
 score REPTO_419_FRAUD                2.996
-score REPTO_419_FRAUD_GM             2.823
-score REPTO_419_FRAUD_QQ             2.682
-score REPTO_419_FRAUD_YJ             2.996
-score RISK_FREE                      2.896
-score SENDGRID_REDIR                 0.001
-score SEO_SUSP_NTLD                  0.969
-score SERGIO_SUBJECT_VIAGRA01        4.196
+score REPTO_419_FRAUD_GM             2.502
+score REPTO_419_FRAUD_QQ             2.035
+score REPTO_419_FRAUD_YJ             2.497
+score RISK_FREE                      1.828
+score SENDGRID_REDIR                 0.779
+score SEO_SUSP_NTLD                  0.559
+score SERGIO_SUBJECT_VIAGRA01        4.195
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_SUBJ           2.326
-score SHORT_SHORTNER                 1.997
+score SHORTENER_SHORT_SUBJ           2.399
+score SHORT_SHORTNER                 1.447
 score SINGLETS_LOW_CONTRAST          0.001
 score SPOOFED_FREEMAIL               1.497
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
@@ -224,56 +224,55 @@
 score STATIC_XPRIO_OLE               0.001
 score STOCK_LOW_CONTRAST             0.001
 score SUSP_UTF8_WORD_SUBJ            1.997
-score THIS_AD                        0.903
-score THIS_IS_ADV_SUSP_NTLD          0.402
-score THREAD_INDEX_HEX               2.131
+score THIS_AD                        0.902
+score THIS_IS_ADV_SUSP_NTLD          0.877
+score THREAD_INDEX_HEX               1.689
 score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.498
 score TO_EQ_FM_DIRECT_MX             2.497
-score TO_EQ_FM_DOM_HTML_IMG          0.052
-score TO_EQ_FM_DOM_HTML_ONLY         0.879
-score TO_EQ_FM_DOM_SPF_FAIL          0.002
-score TO_EQ_FM_HTML_DIRECT           1.303
-score TO_EQ_FM_HTML_ONLY             1.997
-score TO_EQ_FM_SPF_FAIL              0.078
-score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           0.001
-score TO_NO_BRKTS_FROM_MSSP          0.932
-score TO_NO_BRKTS_HTML_IMG           1.699
+score TO_EQ_FM_DOM_HTML_IMG          0.535
+score TO_EQ_FM_DOM_HTML_ONLY         0.888
+score TO_EQ_FM_DOM_SPF_FAIL          0.001
+score TO_EQ_FM_HTML_DIRECT           0.001
+score TO_EQ_FM_HTML_ONLY             1.294
+score TO_EQ_FM_SPF_FAIL              0.084
+score TO_IN_SUBJ                     0.098
+score TO_NAME_SUBJ_NO_RDNS           2.235
+score TO_NO_BRKTS_FROM_MSSP          0.947
+score TO_NO_BRKTS_HTML_IMG           1.783
 score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_MSFT               1.020
-score TO_NO_BRKTS_NORDNS_HTML        0.044
+score TO_NO_BRKTS_MSFT               1.021
+score TO_NO_BRKTS_NORDNS_HTML        0.151
 score TO_NO_BRKTS_PCNT               2.497
-score TVD_RCVD_SPACE_BRACKET         0.994
-score TVD_SPACE_ENCODED              0.001 # force non-zero
-score TVD_SPACE_RATIO_MINFP          1.998
+score TVD_RCVD_SPACE_BRACKET         1.841
+score TVD_SPACE_ENCODED              0.001
+score TVD_SPACE_RATIO_MINFP          2.396
 score UNDISC_FREEM                   2.996
 score UNDISC_MONEY                   3.396
 score UPGRADE_MAILBOX                0.001
-score URI_BUFFLY                     1.999
+score URI_BUFFLY                     1.725
 score URI_DEOBFU_INSTR               3.595
-score URI_DOTDOT_LOW_CNTRST          2.266
-score URI_DOTEDU                     1.476
-score URI_DQ_UNSUB                   2.397
+score URI_DOTDOT_LOW_CNTRST          2.210
+score URI_DOTEDU                     1.160
 score URI_FIREBASEAPP                2.996
-score URI_GOOGLE_PROXY               2.396
-score URI_GOOG_STO_SPAMMY            1.367
-score URI_LONG_REPEAT                1.718
+score URI_GOOGLE_PROXY               2.230
+score URI_GOOG_STO_SPAMMY            2.306
+score URI_LONG_REPEAT                1.346
 score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      1.947
+score URI_PHISH                      2.044
 score URI_PHP_REDIR                  3.496
 score URI_TRY_3LD                    1.997
-score URI_WPADMIN                    2.597
+score URI_WPADMIN                    2.596
 score URI_WP_DIRINDEX                3.496
 score URI_WP_HACKED                  3.496
 score URI_WP_HACKED_2                2.497
 score VFY_ACCT_NORDNS                2.996
-score WANT_TO_ORDER                  1.848
-score WIKI_IMG                       3.009
+score WANT_TO_ORDER                  1.660
+score WIKI_IMG                       3.090
 score WORD_INVIS_MANY                2.996
 score XFER_LOTSA_MONEY               0.001
-score XM_DIGITS_ONLY                 2.999
+score XM_DIGITS_ONLY                 2.632
 score XM_LIGHT_HEAVY                 2.497
-score XM_LONG_DUP_TO                 3.433
+score XM_LONG_DUP_TO                 3.273
 score XM_RANDOM                      2.497
 score XM_RECPTID                     2.996
 score YOUR_DELIVERY_ADDRESS          1.248
@@ -368,7 +367,6 @@
 score MSGID_DOLLARS_URI_IMG          1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
-score ORDER_TODAY                    1.000
 score PDS_HELO_SPF_FAIL              1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHOTO_EDITING_DIRECT           1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index 4300b20..6690170 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,96 +1,97 @@
-# Using score set 0 logs for revision 1889443 from:
-# ham-axb-coi-bulk.r1889443.log ham-axb-generic.r1889443.log ham-axb-ham-misc.r1889443.log ham-darxus.r1889443.log ham-ena-week0.r1889443.log ham-ena-week1.r1889443.log ham-ena-week2.r1889443.log ham-ena-week3.r1889443.log ham-ena-week4.r1889443.log ham-giovanni-ham.r1889443.log ham-giovanni-spammy.r1889443.log ham-giovanni-spam.r1889443.log ham-grenier.r1889443.log ham-hege.r1889443.log ham-jhardin.r1889443.log ham-llanga.r1889443.log ham-mmiroslaw-mails-ham.r1889443.log ham-mmiroslaw-mails-spam.r1889443.log ham-pds.r1889443.log ham-sihde.r1889443.log ham-spamsponge.r1889443.log ham-thendrikx.r1889443.log spam-axb-coi-bulk.r1889443.log spam-axb-generic.r1889443.log spam-axb-ham-misc.r1889443.log spam-darxus.r1889443.log spam-ena-week0.r1889443.log spam-ena-week1.r1889443.log spam-ena-week2.r1889443.log spam-ena-week3.r1889443.log spam-ena-week4.r1889443.log spam-giovanni-ham.r1889443.log spam-giovanni-spammy.r1889443.log spam-giovanni-spam.r1889443.log spam-grenier.r1889443.log spam-hege.r1889443.log spam-jhardin.r1889443.log spam-llanga.r1889443.log spam-mmiroslaw-mails-ham.r1889443.log spam-mmiroslaw-mails-spam.r1889443.log spam-pds.r1889443.log spam-sihde.r1889443.log spam-spamsponge.r1889443.log spam-thendrikx.r1889443.log
+# Using score set 0 logs for revision 1889478 from:
+# ham-axb-coi-bulk.r1889478.log ham-axb-generic.r1889478.log ham-axb-ham-misc.r1889478.log ham-darxus.r1889478.log ham-ena-week0.r1889478.log ham-ena-week1.r1889478.log ham-ena-week2.r1889478.log ham-ena-week3.r1889478.log ham-ena-week4.r1889478.log ham-giovanni-ham.r1889478.log ham-giovanni-spammy.r1889478.log ham-giovanni-spam.r1889478.log ham-grenier.r1889478.log ham-hege.r1889478.log ham-jhardin.r1889478.log ham-llanga.r1889478.log ham-mmiroslaw-mails-ham.r1889478.log ham-mmiroslaw-mails-spam.r1889478.log ham-pds.r1889478.log ham-sihde.r1889478.log ham-spamsponge.r1889478.log ham-thendrikx.r1889478.log spam-axb-coi-bulk.r1889478.log spam-axb-generic.r1889478.log spam-axb-ham-misc.r1889478.log spam-darxus.r1889478.log spam-ena-week0.r1889478.log spam-ena-week1.r1889478.log spam-ena-week2.r1889478.log spam-ena-week3.r1889478.log spam-ena-week4.r1889478.log spam-giovanni-ham.r1889478.log spam-giovanni-spammy.r1889478.log spam-giovanni-spam.r1889478.log spam-grenier.r1889478.log spam-hege.r1889478.log spam-jhardin.r1889478.log spam-llanga.r1889478.log spam-mmiroslaw-mails-ham.r1889478.log spam-mmiroslaw-mails-spam.r1889478.log spam-pds.r1889478.log spam-sihde.r1889478.log spam-spamsponge.r1889478.log spam-thendrikx.r1889478.log
 
 score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.999
 score AC_HTML_NONSENSE_TAGS          1.999
-score ADMITS_SPAM                    4.000
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.989
-score ADVANCE_FEE_2_NEW_MONEY        1.265
-score ADVANCE_FEE_3_NEW              2.401
-score ADVANCE_FEE_3_NEW_FRM_MNY      0.866
-score ADVANCE_FEE_3_NEW_MONEY        0.001
-score ADVANCE_FEE_4_NEW              2.040
+score ADMITS_SPAM                    3.999
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
+score ADVANCE_FEE_2_NEW_MONEY        1.276
+score ADVANCE_FEE_3_NEW              2.500
+score ADVANCE_FEE_3_NEW_FRM_MNY      0.001
+score ADVANCE_FEE_3_NEW_MONEY        1.026
+score ADVANCE_FEE_4_NEW              2.058
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        2.670
-score ADVANCE_FEE_5_NEW              2.285
-score ADVANCE_FEE_5_NEW_FRM_MNY      2.899
-score ADVANCE_FEE_5_NEW_MONEY        0.001
+score ADVANCE_FEE_4_NEW_MONEY        3.099
+score ADVANCE_FEE_5_NEW              2.899
+score ADVANCE_FEE_5_NEW_FRM_MNY      2.999
+score ADVANCE_FEE_5_NEW_MONEY        1.383
 score AD_PREFS                       0.499
 score ALIBABA_IMG_NOT_RCVD_ALI       2.499
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         1.221
+score APP_DEVELOPMENT_NORDNS         1.215
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.973
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.648
 score BIGNUM_EMAILS_FREEM            2.999
-score BITCOIN_DEADLINE               2.271
-score BITCOIN_EXTORT_01              4.692
-score BITCOIN_IMGUR                  3.226
+score BITCOIN_DEADLINE               2.570
+score BITCOIN_IMGUR                  2.581
 score BITCOIN_MALF_HTML              3.499
-score BITCOIN_MALWARE                2.104
-score BITCOIN_ONAN                   2.408
-score BITCOIN_SPAM_02                1.494
-score BITCOIN_SPAM_03                2.499
+score BITCOIN_MALWARE                2.057
+score BITCOIN_ONAN                   2.474
+score BITCOIN_SPAM_02                2.043
+score BITCOIN_SPAM_03                0.001
+score BITCOIN_SPAM_07                2.840
 score BITCOIN_XPRIO                  0.001
-score BITCOIN_YOUR_INFO              2.231
-score BODY_SINGLE_URI                2.499
+score BITCOIN_YOUR_INFO              1.931
+score BODY_SINGLE_URI                0.660
 score BODY_SINGLE_WORD               0.001
-score BODY_URI_ONLY                  2.601
+score BODY_URI_ONLY                  1.955
 score BOGUS_MIME_VERSION             3.499
 score CK_HELO_GENERIC                0.250
 score COMPENSATION                   1.499
 score CONTENT_AFTER_HTML             2.499
 score CTE_8BIT_MISMATCH              0.999
-score DATE_IN_FUTURE_96_Q            0.095
-score DEAR_BENEFICIARY               0.690
+score DATE_IN_FUTURE_96_Q            1.003
+score DEAR_BENEFICIARY               0.010
 score DSN_NO_MIMEVERSION             1.999
-score EBAY_IMG_NOT_RCVD_EBAY         0.828
+score EBAY_IMG_NOT_RCVD_EBAY         0.654
 score END_FUTURE_EMAILS              2.499
-score FAKE_REPLY_A1                  2.159
-score FAKE_REPLY_B                   1.552
-score FBI_MONEY                      1.049
-score FBI_SPOOF                      1.584
-score FILL_THIS_FORM                 1.200
+score FAKE_REPLY_A1                  3.299
+score FBI_MONEY                      1.067
+score FBI_SPOOF                      1.836
+score FILL_THIS_FORM                 1.199
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           1.187
+score FONT_INVIS_LONG_LINE           2.234
 score FONT_INVIS_MSGID               2.499
-score FONT_INVIS_NORDNS              1.781
+score FONT_INVIS_NORDNS              1.700
 score FORM_FRAUD                     0.001
-score FORM_FRAUD_3                   3.099
-score FORM_FRAUD_5                   2.645
+score FORM_FRAUD_3                   3.199
+score FORM_FRAUD_5                   2.045
 score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.250
+score FREEMAIL_FORGED_FROMDOMAIN     0.249
 score FROMSPACE                      3.399
 score FROM_2_EMAILS_SHORT            2.999
-score FROM_IN_TO_AND_SUBJ            2.599
+score FROM_IN_TO_AND_SUBJ            2.699
 score FROM_MISSPACED                 0.001
 score FROM_MISSP_DYNIP               0.001
 score FROM_MISSP_EH_MATCH            0.001
 score FROM_MISSP_FREEMAIL            2.898
-score FROM_MISSP_MSFT                1.873
-score FROM_MISSP_PHISH               0.952
-score FROM_MISSP_REPLYTO             2.397
+score FROM_MISSP_MSFT                2.256
+score FROM_MISSP_PHISH               3.499
+score FROM_MISSP_REPLYTO             2.413
 score FROM_MISSP_TO_UNDISC           0.001
 score FROM_MISSP_USER                0.001
 score FROM_MULTI_NORDNS              0.001
-score FROM_NTLD_REPLY_FREEMAIL       1.785
+score FROM_NTLD_REPLY_FREEMAIL       1.549
 score FROM_SUSPICIOUS_NTLD           0.500
-score FROM_SUSPICIOUS_NTLD_FP        2.000
+score FROM_SUSPICIOUS_NTLD_FP        1.999
+score FROM_WSP_TRAIL                 2.699
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.799
 score GB_FAKE_RF_SHORT               1.999
-score GB_FREEMAIL_DISPTO             0.487
-score GOOGLE_DOC_SUSP                2.999
+score GB_FREEMAIL_DISPTO             0.499
+score GOOGLE_DOC_SUSP                3.000
 score GOOG_REDIR_NORDNS              2.498
-score GOOG_STO_EMAIL_PHISH           2.113
-score GOOG_STO_HTML_PHISH            2.071
+score GOOG_STO_EMAIL_PHISH           2.205
+score GOOG_STO_HTML_PHISH            2.475
+score GOOG_STO_HTML_PHISH_MANY       1.610
 score GOOG_STO_IMG_HTML              2.999
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       1.674
+score HAS_X_OUTGOING_SPAM_STAT       1.999
 score HDRS_LCASE                     0.100
 score HDRS_LCASE_IMGONLY             0.100
 score HDRS_MISSP                     2.499
@@ -99,171 +100,170 @@
 score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.999
-score HK_NAME_FM_MR_MRS              0.678
+score HK_NAME_FM_MR_MRS              0.550
 score HK_NAME_MR_MRS                 0.999
-score HK_RANDOM_ENVFROM              0.999
+score HK_RANDOM_ENVFROM              1.000
 score HK_RANDOM_FROM                 0.999
 score HK_RANDOM_REPLYTO              0.999
-score HK_SCAM                        1.364
-score HOSTED_IMG_DIRECT_MX           2.705
+score HK_SCAM                        1.999
+score HOSTED_IMG_DIRECT_MX           3.174
 score HOSTED_IMG_FREEM               3.499
-score HOSTED_IMG_MULTI               2.259
+score HOSTED_IMG_MULTI               1.752
 score HOSTED_IMG_MULTI_PUB_01        2.999
 score HTML_ENTITY_ASCII              2.999
 score HTML_OFF_PAGE                  2.999
 score HTML_SINGLET_MANY              0.001
-score HTML_TAG_BALANCE_CENTER        2.692
-score HTML_TEXT_INVISIBLE_FONT       1.187
-score HTML_TEXT_INVISIBLE_STYLE      1.491
+score HTML_TAG_BALANCE_CENTER        3.284
+score HTML_TEXT_INVISIBLE_FONT       1.184
+score HTML_TEXT_INVISIBLE_STYLE      0.901
 score JH_SPAMMY_HEADERS              3.499
 score KHOP_FAKE_EBAY                 0.001
 score KHOP_HELO_FCRDNS               0.400
 score LIST_PRTL_SAME_USER            0.001
-score LONG_HEX_URI                   2.599
-score LONG_IMG_URI                   1.273
-score LONG_INVISIBLE_TEXT            2.999
+score LONG_HEX_URI                   2.600
+score LONG_IMG_URI                   0.492
+score LONG_INVISIBLE_TEXT            1.954
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.500
-score LOTTO_DEPT                     0.735
-score MALWARE_NORDNS                 0.001
-score MANY_SPAN_IN_TEXT              2.699
-score MAY_BE_FORGED                  2.092
-score MILLION_HUNDRED                0.001
-score MILLION_USD                    0.048
-score MIMEOLE_DIRECT_TO_MX           0.375
-score MIXED_AREA_CASE                2.499
-score MIXED_CENTER_CASE              1.243
-score MIXED_CTYPE_CASE               2.083
-score MIXED_ES                       3.199
+score LOTTO_AGENT                    1.499
+score LOTTO_DEPT                     0.001
+score MALWARE_NORDNS                 0.045
+score MANY_SPAN_IN_TEXT              2.799
+score MAY_BE_FORGED                  2.090
+score MILLION_HUNDRED                0.001 # force non-zero
+score MILLION_USD                    0.601
+score MIMEOLE_DIRECT_TO_MX           0.001
+score MIXED_AREA_CASE                0.001
+score MIXED_CENTER_CASE              1.242
+score MIXED_CTYPE_CASE               1.061
+score MIXED_ES                       3.299
 score MIXED_FONT_CASE                0.001
 score MIXED_HREF_CASE                1.999
 score MIXED_IMG_CASE                 2.999
 score MONEY_ATM_CARD                 0.001
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               2.204
-score MONEY_FRAUD_3                  2.774
-score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  3.364
-score MONEY_FREEMAIL_REPTO           3.000
+score MONEY_FORM_SHORT               1.953
+score MONEY_FRAUD_3                  3.057
+score MONEY_FRAUD_5                  2.443
+score MONEY_FRAUD_8                  1.039
+score MONEY_FREEMAIL_REPTO           2.999
 score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   2.499
-score MSGID_HDR_MALF                 2.989
-score MSGID_NOFQDN1                  0.486
+score MONEY_NOHTML                   2.500
+score MSGID_HDR_MALF                 2.807
+score MSGID_NOFQDN1                  0.999
 score MSMAIL_PRI_ABNORMAL            0.001
-score MSM_PRIO_REPTO                 0.001
 score NA_DOLLARS                     1.499
 score NICE_REPLY_A                   -0.001
-score NORDNS_LOW_CONTRAST            1.881
+score NORDNS_LOW_CONTRAST            1.878
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.001
+score NUMBEREND_LINKBAIT             0.649
 score ODD_FREEM_REPTO                2.999
-score OFFER_ONLY_AMERICA             1.268
-score ONLINE_MKTG_CNSLT              2.700
+score OFFER_ONLY_AMERICA             1.313
+score ONLINE_MKTG_CNSLT              2.799
 score PDS_BAD_THREAD_QP_64           0.999
 score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.001
-score PDS_DBL_URL_TNB_RUNON          0.158
+score PDS_DBL_URL_TNB_RUNON          1.403
 score PDS_EMPTYSUBJ_URISHRT          1.499
-score PDS_FRNOM_TODOM_DBL_URL        1.487
+score PDS_FRNOM_TODOM_DBL_URL        1.468
 score PDS_FRNOM_TODOM_NAKED_TO       1.499
-score PDS_FROM_2_EMAILS              3.132
-score PDS_FROM_2_EMAILS_SHRTNER      1.412
+score PDS_FROM_2_EMAILS              3.136
+score PDS_FROM_2_EMAILS_SHRTNER      0.271
 score PDS_FROM_NAME_TO_DOMAIN        1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL   0.175
-score PDS_OTHER_BAD_TLD              1.999
+score PDS_NO_FULL_NAME_SPOOFED_URL   0.749
+score PDS_OTHER_BAD_TLD              2.000
 score PDS_PRO_TLD                    0.999
 score PDS_SHORTFWD_URISHRT_FP        1.499
-score PDS_SHORT_SPOOFED_URL          1.093
-score PDS_TINYSUBJ_URISHRT           1.103
+score PDS_SHORT_SPOOFED_URL          1.999
+score PDS_TINYSUBJ_URISHRT           0.837
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
 score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
 score PDS_TONAME_EQ_TOLOCAL_SHORT    1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.999
-score PHISH_FBASEAPP                 1.881
-score PHP_ORIG_SCRIPT                2.297
-score PHP_SCRIPT                     2.453
+score PDS_TONAME_EQ_TOLOCAL_VSHORT   1.000
+score PHISH_FBASEAPP                 0.001
+score PHP_ORIG_SCRIPT                2.251
+score PHP_SCRIPT                     2.499
 score PP_MIME_FAKE_ASCII_TEXT        0.999
 score RAND_HEADER_LIST_SPOOF         2.999
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                0.104
-score RCVD_DOTEDU_SUSP_URI           3.000
-score RDNS_NUM_TLD_XM                2.996
+score RATWARE_NO_RDNS                2.676
+score RCVD_DOTEDU_SUSP_URI           2.999
+score RDNS_NUM_TLD_XM                1.528
 score READY_TO_SHIP                  1.249
-score REPTO_419_FRAUD                2.416
+score REPLYTO_EMPTY                  1.935
+score REPTO_419_FRAUD                2.097
 score REPTO_419_FRAUD_GM             2.999
 score REPTO_419_FRAUD_QQ             2.999
-score REPTO_419_FRAUD_YJ             0.001
-score RISK_FREE                      1.998
-score SENDGRID_REDIR                 1.499
+score REPTO_419_FRAUD_YJ             1.570
+score RISK_FREE                      3.099
+score SENDGRID_REDIR                 1.500
 score SEO_SUSP_NTLD                  1.199
-score SERGIO_SUBJECT_VIAGRA01        3.277
+score SERGIO_SUBJECT_VIAGRA01        3.976
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
 score SHORTENER_SHORT_SUBJ           2.999
-score SHORT_IMG_SUSP_NTLD            0.313
+score SHORT_IMG_SUSP_NTLD            0.943
 score SHORT_SHORTNER                 1.999
 score SINGLETS_LOW_CONTRAST          0.001
 score SPOOFED_FREEMAIL_NO_RDNS       1.499
 score SPOOF_GMAIL_MID                1.499
-score STATIC_XPRIO_OLE               1.623
-score STOCK_LOW_CONTRAST             2.499
+score STATIC_XPRIO_OLE               1.999
+score STOCK_LOW_CONTRAST             1.949
 score SUSP_UTF8_WORD_SUBJ            1.999
-score THIS_AD                        1.399
+score THIS_AD                        1.499
 score THIS_IS_ADV_SUSP_NTLD          1.499
-score THREAD_INDEX_HEX               1.039
+score THREAD_INDEX_HEX               1.202
 score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.499
-score TO_EQ_FM_DIRECT_MX             0.833
+score TO_EQ_FM_DIRECT_MX             1.546
 score TO_EQ_FM_DOM_HTML_IMG          0.001
-score TO_EQ_FM_DOM_HTML_ONLY         1.306
-score TO_EQ_FM_HTML_DIRECT           1.197
-score TO_EQ_FM_HTML_ONLY             1.888
-score TO_IN_SUBJ                     0.100
-score TO_NAME_SUBJ_NO_RDNS           1.598
-score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           0.689
+score TO_EQ_FM_DOM_HTML_ONLY         1.750
+score TO_EQ_FM_HTML_DIRECT           0.274
+score TO_EQ_FM_HTML_ONLY             2.099
+score TO_IN_SUBJ                     0.099
+score TO_NAME_SUBJ_NO_RDNS           1.593
+score TO_NO_BRKTS_FROM_MSSP          2.486
+score TO_NO_BRKTS_HTML_IMG           1.198
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               2.500
-score TO_NO_BRKTS_NORDNS_HTML        0.285
+score TO_NO_BRKTS_MSFT               2.499
+score TO_NO_BRKTS_NORDNS_HTML        0.592
 score TO_NO_BRKTS_PCNT               2.500
-score TVD_RCVD_SPACE_BRACKET         2.756
-score TVD_SPACE_ENCODED              0.550
-score TVD_SPACE_RATIO_MINFP          2.444
-score UNDISC_FREEM                   3.099
+score TVD_RCVD_SPACE_BRACKET         2.763
+score TVD_SPACE_ENCODED              0.551
+score TVD_SPACE_RATIO_MINFP          2.499
+score UNDISC_FREEM                   3.199
 score UNDISC_MONEY                   3.499
-score UNICODE_OBFU_ZW                3.499
-score UPGRADE_MAILBOX                1.299
-score URI_BUFFLY                     1.693
-score URI_DEOBFU_INSTR               3.599
+score UPGRADE_MAILBOX                1.399
+score URI_BUFFLY                     1.999
+score URI_DEOBFU_INSTR               3.700
 score URI_DOTDOT_LOW_CNTRST          2.499
-score URI_DOTEDU                     1.938
-score URI_DQ_UNSUB                   2.399
+score URI_DOTEDU                     1.999
+score URI_DQ_UNSUB                   2.499
 score URI_FIREBASEAPP                2.999
 score URI_GOOGLE_PROXY               2.999
-score URI_GOOG_STO_SPAMMY            2.977
-score URI_LONG_REPEAT                0.924
-score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      3.004
+score URI_GOOG_STO_SPAMMY            2.523
+score URI_LONG_REPEAT                0.692
+score URI_ONLY_MSGID_MALF            0.535
+score URI_PHISH                      2.788
 score URI_PHP_REDIR                  3.500
 score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.699
-score URI_WP_DIRINDEX                2.547
+score URI_WP_DIRINDEX                3.499
 score URI_WP_HACKED                  3.499
 score URI_WP_HACKED_2                2.499
-score VFY_ACCT_NORDNS                1.998
-score WANT_TO_ORDER                  1.852
-score WIKI_IMG                       3.000
+score VFY_ACCT_NORDNS                1.997
+score WANT_TO_ORDER                  2.053
+score WIKI_IMG                       3.001
 score WORD_INVIS_MANY                2.999
-score XFER_LOTSA_MONEY               0.999
+score XFER_LOTSA_MONEY               1.000
 score XM_DIGITS_ONLY                 3.000
-score XM_LIGHT_HEAVY                 2.391
-score XM_LONG_DUP_TO                 3.799
-score XM_RANDOM                      2.500
+score XM_LIGHT_HEAVY                 2.395
+score XM_LONG_DUP_TO                 3.899
+score XM_RANDOM                      2.499
 score XM_RECPTID                     2.999
 score XPRIO                          0.001
-score YOUR_DELIVERY_ADDRESS          1.032
-score YOU_INHERIT                    1.279
+score YOUR_DELIVERY_ADDRESS          1.249
+score YOU_INHERIT                    0.689
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -279,13 +279,13 @@
 score APP_DEVELOPMENT_FREEM          1.000
 score BIGNUM_EMAILS_MANY             1.000
 score BITCOIN_BOMB                   1.000
+score BITCOIN_EXTORT_01              1.000
 score BITCOIN_EXTORT_02              1.000
 score BITCOIN_OBFU_SUBJ              1.000
 score BITCOIN_PAY_ME                 1.000
 score BITCOIN_SPAM_01                1.000
 score BITCOIN_SPAM_04                1.000
 score BITCOIN_SPAM_06                1.000
-score BITCOIN_SPAM_07                1.000
 score BITCOIN_SPAM_08                1.000
 score BITCOIN_SPAM_09                1.000
 score BITCOIN_SPAM_10                1.000
@@ -319,7 +319,6 @@
 score GOOGLE_DOCS_PHISH_MANY         1.000
 score GOOGLE_DRIVE_REPLY_BAD_NTLD    1.000
 score GOOG_MALWARE_DNLD              1.000
-score GOOG_STO_HTML_PHISH_MANY       1.000
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 1.000
 score HEXHASH_WORD                   1.000
@@ -343,9 +342,9 @@
 score MONERO_MALWARE                 1.000
 score MONERO_PAY_ME                  1.000
 score MSGID_DOLLARS_URI_IMG          1.000
+score MSM_PRIO_REPTO                 1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
-score ORDER_TODAY                    1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHOTO_EDITING_DIRECT           1.000
 score PHOTO_EDITING_FREEM            1.000
@@ -376,6 +375,7 @@
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ASC               1.000
+score UNICODE_OBFU_ZW                1.000
 score URI_ADOBESPARK                 1.000
 score URI_AZURE_CLOUDAPP             1.000
 score URI_DASHGOVEDU                 1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index a0ca7b2..ea4076b 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -1,10 +1,10 @@
 # Using score set 1 logs for revision 1889355 from:
 # ham-net-axb-coi-bulk.r1889355.log ham-net-axb-generic.r1889355.log ham-net-axb-ham-misc.r1889355.log ham-net-darxus.r1889355.log ham-net-ena-week0.r1889355.log ham-net-ena-week1.r1889355.log ham-net-ena-week2.r1889355.log ham-net-ena-week3.r1889355.log ham-net-ena-week4.r1889355.log ham-net-grenier.r1889355.log ham-net-hege.r1889355.log ham-net-jhardin.r1889355.log ham-net-llanga.r1889355.log ham-net-mmiroslaw-mails-ham.r1889355.log ham-net-mmiroslaw-mails-spam.r1889355.log ham-net-pds.r1889355.log ham-net-sihde.r1889355.log ham-net-spamsponge.r1889355.log ham-net-thendrikx.r1889355.log spam-net-axb-coi-bulk.r1889355.log spam-net-axb-generic.r1889355.log spam-net-axb-ham-misc.r1889355.log spam-net-darxus.r1889355.log spam-net-ena-week0.r1889355.log spam-net-ena-week1.r1889355.log spam-net-ena-week2.r1889355.log spam-net-ena-week3.r1889355.log spam-net-ena-week4.r1889355.log spam-net-grenier.r1889355.log spam-net-hege.r1889355.log spam-net-jhardin.r1889355.log spam-net-llanga.r1889355.log spam-net-mmiroslaw-mails-ham.r1889355.log spam-net-mmiroslaw-mails-spam.r1889355.log spam-net-pds.r1889355.log spam-net-sihde.r1889355.log spam-net-spamsponge.r1889355.log spam-net-thendrikx.r1889355.log
 
-score ACCT_PHISHING_MANY             0.376
+score ACCT_PHISHING_MANY             0.427
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_FROM_MANY_DOTS              2.997
+score AC_FROM_MANY_DOTS              2.996
 score AC_HTML_NONSENSE_TAGS          1.997
 score ADMITS_SPAM                    3.895
 score ADVANCE_FEE_2_NEW_FRM_MNY      0.001
@@ -12,62 +12,62 @@
 score ADVANCE_FEE_3_NEW              3.496
 score ADVANCE_FEE_3_NEW_FRM_MNY      2.497
 score ADVANCE_FEE_3_NEW_MONEY        0.001
-score ADVANCE_FEE_4_NEW              0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        2.090
-score ADVANCE_FEE_5_NEW              2.492
+score ADVANCE_FEE_4_NEW              2.497
+score ADVANCE_FEE_4_NEW_FRM_MNY      0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY        2.107
+score ADVANCE_FEE_5_NEW              2.570
 score ADVANCE_FEE_5_NEW_FRM_MNY      2.796
-score ADVANCE_FEE_5_NEW_MONEY        1.682
+score ADVANCE_FEE_5_NEW_MONEY        3.196
 score AD_PREFS                       0.498
-score ALIBABA_IMG_NOT_RCVD_ALI       2.166
+score ALIBABA_IMG_NOT_RCVD_ALI       2.277
 score AMAZON_IMG_NOT_RCVD_AMZN       0.001
-score APP_DEVELOPMENT_NORDNS         0.813
+score APP_DEVELOPMENT_NORDNS         0.814
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.803
-score BIGNUM_EMAILS_FREEM            2.469
-score BITCOIN_DEADLINE               2.720
-score BITCOIN_EXTORT_01              4.764
-score BITCOIN_IMGUR                  3.496
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.797
+score BIGNUM_EMAILS_FREEM            1.948
+score BITCOIN_DEADLINE               1.814
+score BITCOIN_EXTORT_01              3.083
+score BITCOIN_IMGUR                  3.356
 score BITCOIN_MALF_HTML              3.496
-score BITCOIN_MALWARE                1.494
+score BITCOIN_MALWARE                1.322
 score BITCOIN_ONAN                   2.996
 score BITCOIN_SPAM_02                2.497
-score BITCOIN_SPAM_03                2.497
-score BITCOIN_SPAM_05                0.001 # force non-zero
-score BITCOIN_XPRIO                  0.004
-score BITCOIN_YOUR_INFO              1.777
+score BITCOIN_SPAM_03                0.001
+score BITCOIN_SPAM_05                0.001
+score BITCOIN_XPRIO                  0.001
+score BITCOIN_YOUR_INFO              2.681
 score BODY_SINGLE_URI                2.497
 score BODY_SINGLE_WORD               0.001
-score BODY_URI_ONLY                  1.525
-score BOGUS_MIME_VERSION             2.550
-score CK_HELO_GENERIC                0.001
+score BODY_URI_ONLY                  1.536
+score BOGUS_MIME_VERSION             1.890
+score CK_HELO_GENERIC                0.001 # force non-zero
 score CONTENT_AFTER_HTML             2.497
-score CTE_8BIT_MISMATCH              0.838
-score DATE_IN_FUTURE_96_Q            1.845
-score DEAR_BENEFICIARY               0.001
+score CTE_8BIT_MISMATCH              0.837
+score DATE_IN_FUTURE_96_Q            2.037
+score DEAR_BENEFICIARY               3.196
 score DKIMWL_BL                      2.996
-score DKIMWL_WL_HIGH                 -0.697
-score DKIMWL_WL_MED                  -0.001 # force non-zero
+score DKIMWL_WL_HIGH                 -0.693
+score DKIMWL_WL_MED                  -0.001
 score DKIMWL_WL_MEDHI                -0.001
 score DSN_NO_MIMEVERSION             1.997
-score EBAY_IMG_NOT_RCVD_EBAY         1.484
-score FAKE_REPLY_A1                  2.747
-score FAKE_REPLY_B                   2.110
-score FBI_MONEY                      0.755
-score FBI_SPOOF                      1.343
-score FILL_THIS_FORM                 0.001
-score FONT_INVIS_DIRECT              1.392
-score FONT_INVIS_HTML_NOHTML         2.846
-score FONT_INVIS_LONG_LINE           2.997
-score FONT_INVIS_MSGID               1.722
+score EBAY_IMG_NOT_RCVD_EBAY         2.999
+score FAKE_REPLY_A1                  2.727
+score FAKE_REPLY_B                   2.210
+score FBI_MONEY                      0.043
+score FBI_SPOOF                      1.999
+score FILL_THIS_FORM                 0.001 # force non-zero
+score FONT_INVIS_DIRECT              1.750
+score FONT_INVIS_HTML_NOHTML         2.379
+score FONT_INVIS_LONG_LINE           2.996
+score FONT_INVIS_MSGID               1.951
 score FONT_INVIS_NORDNS              2.497
-score FORGED_SPF_HELO                2.697
+score FORGED_SPF_HELO                2.696
 score FORM_FRAUD                     0.001
-score FORM_FRAUD_3                   0.839
-score FORM_FRAUD_5                   2.858
-score FOUND_YOU                      0.685
+score FORM_FRAUD_3                   1.357
+score FORM_FRAUD_5                   1.944
+score FOUND_YOU                      0.683
 score FREEMAIL_FORGED_FROMDOMAIN     0.248
-score FROMSPACE                      2.980
+score FROMSPACE                      3.296
 score FROM_2_EMAILS_SHORT            2.996
 score FROM_FMBLA_NEWDOM              1.498
 score FROM_FMBLA_NEWDOM14            0.998
@@ -76,146 +76,146 @@
 score FROM_GOV_SPOOF                 0.998
 score FROM_IN_TO_AND_SUBJ            2.497
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               0.136
+score FROM_MISSP_DYNIP               2.498
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            0.001
+score FROM_MISSP_FREEMAIL            0.001 # force non-zero
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_PHISH               0.001
 score FROM_MISSP_REPLYTO             2.497
-score FROM_MISSP_SPF_FAIL            0.874
+score FROM_MISSP_SPF_FAIL            0.876
 score FROM_MISSP_TO_UNDISC           0.001
 score FROM_MISSP_USER                0.001
 score FROM_MULTI_NORDNS              3.995
-score FROM_NEWDOM_BTC                1.122
-score FROM_NTLD_REPLY_FREEMAIL       0.409
-score FROM_PAYPAL_SPOOF              0.071
+score FROM_NEWDOM_BTC                1.999
+score FROM_NTLD_REPLY_FREEMAIL       0.685
+score FROM_PAYPAL_SPOOF              1.097
 score FROM_SUSPICIOUS_NTLD           0.498
 score FROM_SUSPICIOUS_NTLD_FP        1.997
 score FSL_BULK_SIG                   0.001
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.696
-score FUZZY_BITCOIN                  2.376
+score FUZZY_BITCOIN                  0.080
 score GB_FAKE_RF_SHORT               1.997
-score GB_FREEMAIL_DISPTO             0.498
+score GB_FREEMAIL_DISPTO             0.499
 score GOOGLE_DOC_SUSP                2.996
-score GOOG_REDIR_NORDNS              1.817
-score GOOG_STO_HTML_PHISH            1.587
+score GOOG_REDIR_NORDNS              1.878
+score GOOG_STO_HTML_PHISH            1.016
 score GOOG_STO_IMG_HTML              2.996
-score GOOG_STO_NOIMG_HTML            2.996
-score HAS_X_OUTGOING_SPAM_STAT       1.985
+score GOOG_STO_NOIMG_HTML            2.997
+score HAS_X_OUTGOING_SPAM_STAT       1.997
 score HDRS_LCASE                     0.098
-score HDRS_LCASE_IMGONLY             0.098
+score HDRS_LCASE_IMGONLY             0.099
 score HDRS_MISSP                     2.497
-score HDR_ORDER_FTSDMCXX_DIRECT      1.810
+score HDR_ORDER_FTSDMCXX_DIRECT      1.816
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.248
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.998
 score HK_NAME_FM_MR_MRS              1.498
 score HK_NAME_MR_MRS                 0.998
 score HK_RANDOM_ENVFROM              0.998
 score HK_RANDOM_FROM                 0.998
-score HK_RANDOM_REPLYTO              0.904
-score HK_SCAM                        0.001
-score HOSTED_IMG_DIRECT_MX           3.110
+score HK_RANDOM_REPLYTO              0.850
+score HK_SCAM                        0.731
+score HOSTED_IMG_DIRECT_MX           1.730
 score HOSTED_IMG_FREEM               3.496
-score HOSTED_IMG_MULTI               0.547
+score HOSTED_IMG_MULTI               0.834
 score HOSTED_IMG_MULTI_PUB_01        2.996
-score HTML_ENTITY_ASCII              2.953
+score HTML_ENTITY_ASCII              2.940
 score HTML_OFF_PAGE                  2.996
-score HTML_SINGLET_MANY              1.161
-score HTML_TAG_BALANCE_CENTER        2.976
-score HTML_TEXT_INVISIBLE_FONT       0.827
-score HTML_TEXT_INVISIBLE_STYLE      1.923
+score HTML_SINGLET_MANY              1.391
+score HTML_TAG_BALANCE_CENTER        2.963
+score HTML_TEXT_INVISIBLE_FONT       0.496
+score HTML_TEXT_INVISIBLE_STYLE      1.931
 score JH_SPAMMY_HEADERS              3.496
 score KHOP_FAKE_EBAY                 1.198
 score KHOP_HELO_FCRDNS               0.398
-score LIST_PRTL_SAME_USER            0.687
+score LIST_PRTL_SAME_USER            0.901
 score LONG_HEX_URI                   0.001
-score LONG_IMG_URI                   0.939
-score LONG_INVISIBLE_TEXT            2.545
+score LONG_IMG_URI                   0.929
+score LONG_INVISIBLE_TEXT            2.302
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    1.498
 score LOTTO_DEPT                     0.001
 score MALWARE_NORDNS                 0.001
-score MANY_SPAN_IN_TEXT              2.696
-score MAY_BE_FORGED                  2.896
-score MILLION_HUNDRED                2.996
-score MILLION_USD                    0.978
+score MANY_SPAN_IN_TEXT              2.619
+score MAY_BE_FORGED                  1.136
+score MILLION_HUNDRED                0.001
+score MILLION_USD                    0.001
 score MIMEOLE_DIRECT_TO_MX           0.001
-score MIXED_AREA_CASE                2.031
-score MIXED_CENTER_CASE              1.953
-score MIXED_CTYPE_CASE               2.429
-score MIXED_ES                       2.596
-score MIXED_FONT_CASE                0.331
+score MIXED_AREA_CASE                1.547
+score MIXED_CENTER_CASE              1.727
+score MIXED_CTYPE_CASE               1.155
+score MIXED_ES                       2.594
+score MIXED_FONT_CASE                0.387
 score MIXED_HREF_CASE                1.997
 score MIXED_IMG_CASE                 2.996
 score MONEY_ATM_CARD                 0.001
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               1.698
-score MONEY_FRAUD_3                  2.623
+score MONEY_FORM_SHORT               1.432
+score MONEY_FRAUD_3                  2.798
 score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  1.296
-score MONEY_FREEMAIL_REPTO           0.987
+score MONEY_FRAUD_8                  0.543
+score MONEY_FREEMAIL_REPTO           1.084
 score MONEY_FROM_41                  1.997
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   2.498
+score MONEY_NOHTML                   2.497
 score MSGID_HDR_MALF                 3.496
-score MSGID_NOFQDN1                  2.758
-score MSMAIL_PRI_ABNORMAL            1.386
+score MSGID_NOFQDN1                  1.811
+score MSMAIL_PRI_ABNORMAL            0.478
 score MSM_PRIO_REPTO                 0.001
 score NA_DOLLARS                     1.498
 score NICE_REPLY_A                   -0.001
-score NORDNS_LOW_CONTRAST            2.269
+score NORDNS_LOW_CONTRAST            2.223
 score NO_FM_NAME_IP_HOSTN            0.001
-score NSL_RCVD_FROM_USER             0.001 # force non-zero
+score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBEREND_LINKBAIT             0.999
-score ODD_FREEM_REPTO                2.996
-score OFFER_ONLY_AMERICA             0.809
+score NUMBEREND_LINKBAIT             0.235
+score ODD_FREEM_REPTO                2.935
+score OFFER_ONLY_AMERICA             0.894
 score ONLINE_MKTG_CNSLT              2.696
 score PDS_BAD_THREAD_QP_64           0.998
 score PDS_BTC_ID                     0.498
-score PDS_BTC_MSGID                  0.001
+score PDS_BTC_MSGID                  0.179
 score PDS_DBL_URL_TNB_RUNON          0.001
 score PDS_EMPTYSUBJ_URISHRT          0.001
-score PDS_FRNOM_TODOM_DBL_URL        1.498
-score PDS_FRNOM_TODOM_NAKED_TO       1.122
-score PDS_FROM_2_EMAILS              3.371
-score PDS_FROM_2_EMAILS_SHRTNER      0.867
-score PDS_FROM_NAME_TO_DOMAIN        1.550
-score PDS_NO_FULL_NAME_SPOOFED_URL   0.535
+score PDS_FRNOM_TODOM_DBL_URL        1.497
+score PDS_FRNOM_TODOM_NAKED_TO       0.689
+score PDS_FROM_2_EMAILS              2.652
+score PDS_FROM_2_EMAILS_SHRTNER      0.249
+score PDS_FROM_NAME_TO_DOMAIN        1.836
+score PDS_NO_FULL_NAME_SPOOFED_URL   0.718
 score PDS_OTHER_BAD_TLD              1.997
 score PDS_PRO_TLD                    0.998
-score PDS_SHORTFWD_URISHRT_FP        1.499
-score PDS_SHORT_SPOOFED_URL          1.714
+score PDS_SHORTFWD_URISHRT_FP        1.498
+score PDS_SHORT_SPOOFED_URL          0.806
 score PDS_TINYSUBJ_URISHRT           0.001
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.001
 score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.997
 score PDS_TONAME_EQ_TOLOCAL_SHORT    1.997
-score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.999
-score PHISH_FBASEAPP                 2.494
+score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.998
+score PHISH_FBASEAPP                 2.976
 score PHP_ORIG_SCRIPT                0.001
-score PHP_SCRIPT                     0.308
-score PP_MIME_FAKE_ASCII_TEXT        0.807
+score PHP_SCRIPT                     0.815
+score PP_MIME_FAKE_ASCII_TEXT        0.842
 score RAND_HEADER_LIST_SPOOF         2.996
 score RAND_MKTG_HEADER               1.997
-score RATWARE_NO_RDNS                2.999
+score RATWARE_NO_RDNS                1.353
 score RCVD_DOTEDU_SUSP_URI           2.996
 score RCVD_IN_MSPIKE_H2              -0.001
 score READY_TO_SHIP                  1.248
 score REPTO_419_FRAUD                2.996
-score REPTO_419_FRAUD_GM             2.823
-score REPTO_419_FRAUD_QQ             2.682
-score REPTO_419_FRAUD_YJ             2.996
-score RISK_FREE                      2.896
-score SENDGRID_REDIR                 0.001
-score SEO_SUSP_NTLD                  0.969
-score SERGIO_SUBJECT_VIAGRA01        4.196
+score REPTO_419_FRAUD_GM             2.502
+score REPTO_419_FRAUD_QQ             2.035
+score REPTO_419_FRAUD_YJ             2.497
+score RISK_FREE                      1.828
+score SENDGRID_REDIR                 0.779
+score SEO_SUSP_NTLD                  0.559
+score SERGIO_SUBJECT_VIAGRA01        4.195
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
-score SHORTENER_SHORT_SUBJ           2.326
-score SHORT_SHORTNER                 1.997
+score SHORTENER_SHORT_SUBJ           2.399
+score SHORT_SHORTNER                 1.447
 score SINGLETS_LOW_CONTRAST          0.001
 score SPOOFED_FREEMAIL               1.497
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
@@ -224,56 +224,55 @@
 score STATIC_XPRIO_OLE               0.001
 score STOCK_LOW_CONTRAST             0.001
 score SUSP_UTF8_WORD_SUBJ            1.997
-score THIS_AD                        0.903
-score THIS_IS_ADV_SUSP_NTLD          0.402
-score THREAD_INDEX_HEX               2.131
+score THIS_AD                        0.902
+score THIS_IS_ADV_SUSP_NTLD          0.877
+score THREAD_INDEX_HEX               1.689
 score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.498
 score TO_EQ_FM_DIRECT_MX             2.497
-score TO_EQ_FM_DOM_HTML_IMG          0.052
-score TO_EQ_FM_DOM_HTML_ONLY         0.879
-score TO_EQ_FM_DOM_SPF_FAIL          0.002
-score TO_EQ_FM_HTML_DIRECT           1.303
-score TO_EQ_FM_HTML_ONLY             1.997
-score TO_EQ_FM_SPF_FAIL              0.078
-score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           0.001
-score TO_NO_BRKTS_FROM_MSSP          0.932
-score TO_NO_BRKTS_HTML_IMG           1.699
+score TO_EQ_FM_DOM_HTML_IMG          0.535
+score TO_EQ_FM_DOM_HTML_ONLY         0.888
+score TO_EQ_FM_DOM_SPF_FAIL          0.001
+score TO_EQ_FM_HTML_DIRECT           0.001
+score TO_EQ_FM_HTML_ONLY             1.294
+score TO_EQ_FM_SPF_FAIL              0.084
+score TO_IN_SUBJ                     0.098
+score TO_NAME_SUBJ_NO_RDNS           2.235
+score TO_NO_BRKTS_FROM_MSSP          0.947
+score TO_NO_BRKTS_HTML_IMG           1.783
 score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_MSFT               1.020
-score TO_NO_BRKTS_NORDNS_HTML        0.044
+score TO_NO_BRKTS_MSFT               1.021
+score TO_NO_BRKTS_NORDNS_HTML        0.151
 score TO_NO_BRKTS_PCNT               2.497
-score TVD_RCVD_SPACE_BRACKET         0.994
-score TVD_SPACE_ENCODED              0.001 # force non-zero
-score TVD_SPACE_RATIO_MINFP          1.998
+score TVD_RCVD_SPACE_BRACKET         1.841
+score TVD_SPACE_ENCODED              0.001
+score TVD_SPACE_RATIO_MINFP          2.396
 score UNDISC_FREEM                   2.996
 score UNDISC_MONEY                   3.396
 score UPGRADE_MAILBOX                0.001
-score URI_BUFFLY                     1.999
+score URI_BUFFLY                     1.725
 score URI_DEOBFU_INSTR               3.595
-score URI_DOTDOT_LOW_CNTRST          2.266
-score URI_DOTEDU                     1.476
-score URI_DQ_UNSUB                   2.397
+score URI_DOTDOT_LOW_CNTRST          2.210
+score URI_DOTEDU                     1.160
 score URI_FIREBASEAPP                2.996
-score URI_GOOGLE_PROXY               2.396
-score URI_GOOG_STO_SPAMMY            1.367
-score URI_LONG_REPEAT                1.718
+score URI_GOOGLE_PROXY               2.230
+score URI_GOOG_STO_SPAMMY            2.306
+score URI_LONG_REPEAT                1.346
 score URI_ONLY_MSGID_MALF            0.001
-score URI_PHISH                      1.947
+score URI_PHISH                      2.044
 score URI_PHP_REDIR                  3.496
 score URI_TRY_3LD                    1.997
-score URI_WPADMIN                    2.597
+score URI_WPADMIN                    2.596
 score URI_WP_DIRINDEX                3.496
 score URI_WP_HACKED                  3.496
 score URI_WP_HACKED_2                2.497
 score VFY_ACCT_NORDNS                2.996
-score WANT_TO_ORDER                  1.848
-score WIKI_IMG                       3.009
+score WANT_TO_ORDER                  1.660
+score WIKI_IMG                       3.090
 score WORD_INVIS_MANY                2.996
 score XFER_LOTSA_MONEY               0.001
-score XM_DIGITS_ONLY                 2.999
+score XM_DIGITS_ONLY                 2.632
 score XM_LIGHT_HEAVY                 2.497
-score XM_LONG_DUP_TO                 3.433
+score XM_LONG_DUP_TO                 3.273
 score XM_RANDOM                      2.497
 score XM_RECPTID                     2.996
 score YOUR_DELIVERY_ADDRESS          1.248
@@ -368,7 +367,6 @@
 score MSGID_DOLLARS_URI_IMG          1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
-score ORDER_TODAY                    1.000
 score PDS_HELO_SPF_FAIL              1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHOTO_EDITING_DIRECT           1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 929e674..3d090de 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: 267371  31.980%  (99.436% of non-spam corpus)
-# Correctly spam:     426332  50.993%  (75.168% of spam corpus)
-# False positives:      1517  0.181%  (0.564% of nonspam,  98388 weighted)
-# False negatives:    140838  16.845%  (24.832% of spam, 309866 weighted)
+# Correctly non-spam: 268119  32.071%  (99.444% of non-spam corpus)
+# Correctly spam:     425350  50.878%  (75.096% of spam corpus)
+# False positives:      1500  0.179%  (0.556% of nonspam,  95953 weighted)
+# False negatives:    141056  16.872%  (24.904% of spam, 310238 weighted)
 # Average score for spam:  9.8    nonspam: 0.7
 # Average for false-pos:   6.1  false-neg: 2.2
-# TOTAL:              836058  100.00%
+# TOTAL:              836025  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  33437  99.47%
-# Correctly spam:      53231  75.18%
-# False positives:       177  0.53%
-# False negatives:     17574  24.82%
-# TCR(l=50): 2.679572  SpamRecall: 75.180%  SpamPrec: 99.669%
+# Correctly non-spam:  33527  99.46%
+# Correctly spam:      52803  74.67%
+# False positives:       182  0.54%
+# False negatives:     17908  25.33%
+# TCR(l=50): 2.618150  SpamRecall: 74.674%  SpamPrec: 99.657%
 
 ##### 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: 258855  96.27%
-# Correctly spam:     266132  46.92%
-# False positives:     10033  3.73%
-# False negatives:    301038  53.08%
-# TCR(l=50): 0.706588  SpamRecall: 46.923%  SpamPrec: 96.367%
+# Correctly non-spam: 259718  96.33%
+# Correctly spam:     264443  46.69%
+# False positives:      9901  3.67%
+# False negatives:    301963  53.31%
+# TCR(l=50): 0.710661  SpamRecall: 46.688%  SpamPrec: 96.391%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  32357  96.26%
-# Correctly spam:      33259  46.97%
-# False positives:      1257  3.74%
-# False negatives:     37546  53.03%
-# TCR(l=50): 0.705257  SpamRecall: 46.973%  SpamPrec: 96.358%
+# Correctly non-spam:  32471  96.33%
+# Correctly spam:      32943  46.59%
+# False positives:      1238  3.67%
+# False negatives:     37768  53.41%
+# TCR(l=50): 0.709465  SpamRecall: 46.588%  SpamPrec: 96.378%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 0228d1d..4efc0de 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 266782  32.017%  (99.124% of non-spam corpus)
-# Correctly spam:     473583  56.836%  (83.953% of spam corpus)
-# False positives:      2358  0.283%  (0.876% of nonspam, 311193 weighted)
-# False negatives:     90520  10.864%  (16.047% of spam, 182616 weighted)
-# Average score for spam:  14.4    nonspam: -1.5
+# Correctly non-spam: 266719  32.010%  (99.101% of non-spam corpus)
+# Correctly spam:     475091  57.017%  (84.221% of spam corpus)
+# False positives:      2419  0.290%  (0.899% of nonspam, 319587 weighted)
+# False negatives:     89009  10.682%  (15.779% of spam, 175327 weighted)
+# Average score for spam:  14.2    nonspam: -1.5
 # Average for false-pos:   6.3  false-neg: 2.0
-# TOTAL:              833243  100.00%
+# TOTAL:              833238  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  33302  98.98%
-# Correctly spam:      59389  84.31%
-# False positives:       342  1.02%
-# False negatives:     11049  15.69%
-# TCR(l=50): 2.502327  SpamRecall: 84.314%  SpamPrec: 99.427%
+# Correctly non-spam:  33316  99.03%
+# Correctly spam:      59290  84.17%
+# False positives:       328  0.97%
+# False negatives:     11148  15.83%
+# TCR(l=50): 2.556919  SpamRecall: 84.173%  SpamPrec: 99.450%
 
 ##### 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: 265542  98.66%
-# Correctly spam:     308556  54.70%
-# False positives:      3598  1.34%
-# False negatives:    255547  45.30%
-# TCR(l=50): 1.295457  SpamRecall: 54.699%  SpamPrec: 98.847%
+# Correctly non-spam: 265530  98.66%
+# Correctly spam:     308536  54.70%
+# False positives:      3608  1.34%
+# False negatives:    255564  45.30%
+# TCR(l=50): 1.293914  SpamRecall: 54.695%  SpamPrec: 98.844%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  33189  98.65%
-# Correctly spam:      38648  54.87%
-# False positives:       455  1.35%
-# False negatives:     31790  45.13%
-# TCR(l=50): 1.291492  SpamRecall: 54.868%  SpamPrec: 98.836%
+# Correctly non-spam:  33185  98.64%
+# Correctly spam:      38630  54.84%
+# False positives:       459  1.36%
+# False negatives:     31808  45.16%
+# TCR(l=50): 1.286351  SpamRecall: 54.843%  SpamPrec: 98.826%