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

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1903275 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index 9479362..93918f5 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,7 +1,7 @@
 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 3.000 2.999 3.000
-score AC_HTML_NONSENSE_TAGS                 1.999 1.999 1.999 1.999
+score AC_FROM_MANY_DOTS                     2.996 2.999 2.996 2.999
+score AC_HTML_NONSENSE_TAGS                 1.997 1.999 1.997 1.999
 score AC_POST_EXTRAS                        1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS1               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS10              1.000 1.000 1.000 1.000
@@ -12,46 +12,48 @@
 score AC_SPAMMY_URI_PATTERNS4               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS8               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS9               1.000 1.000 1.000 1.000
-score ADMITS_SPAM                           3.099 2.999 3.099 2.999
+score ADMITS_SPAM                           3.196 2.999 3.196 2.999
 score ADULT_DATING_COMPANY                  10.000 10.000 10.000 10.000
 score ADVANCE_FEE_2_NEW_FORM                1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY             1.860 0.343 1.860 0.343
-score ADVANCE_FEE_2_NEW_MONEY               0.878 0.001 0.878 0.001
-score ADVANCE_FEE_3_NEW                     3.499 3.499 3.499 3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY             2.299 2.199 2.299 2.199
-score ADVANCE_FEE_3_NEW_MONEY               2.799 2.387 2.799 2.387
-score ADVANCE_FEE_4_NEW                     2.199 2.199 2.199 2.199
-score ADVANCE_FEE_4_NEW_FRM_MNY             2.500 2.400 2.500 2.400
-score ADVANCE_FEE_4_NEW_MONEY               0.990 1.894 0.990 1.894
-score ADVANCE_FEE_5_NEW                     2.400 2.299 2.400 2.299
+score ADVANCE_FEE_2_NEW_FRM_MNY             0.532 0.990 0.532 0.990
+score ADVANCE_FEE_2_NEW_MONEY               1.997 0.001 1.997 0.001
+score ADVANCE_FEE_3_NEW                     3.496 3.499 3.496 3.499
+score ADVANCE_FEE_3_NEW_FRM_MNY             2.297 2.199 2.297 2.199
+score ADVANCE_FEE_3_NEW_MONEY               2.796 2.263 2.796 2.263
+score ADVANCE_FEE_4_NEW                     2.197 2.199 2.197 2.199
+score ADVANCE_FEE_4_NEW_FRM_MNY             2.397 2.399 2.397 2.399
+score ADVANCE_FEE_4_NEW_MONEY               1.489 1.702 1.489 1.702
+score ADVANCE_FEE_5_NEW                     2.398 2.300 2.398 2.300
 score ADVANCE_FEE_5_NEW_FRM_MNY             0.001 0.001 0.001 0.001
 score ADVANCE_FEE_5_NEW_MONEY               0.001 0.001 0.001 0.001
-score AD_PREFS                              0.001 0.001 0.001 0.001
-score ALIBABA_IMG_NOT_RCVD_ALI              2.499 2.499 2.499 2.499
-score AMAZON_IMG_NOT_RCVD_AMZN              2.499 1.099 2.499 1.099
-score APOSTROPHE_TOCC                       0.999 0.999 0.999 0.999
+score AD_PREFS                              0.230 0.001 0.230 0.001
+score ALIBABA_IMG_NOT_RCVD_ALI              2.497 2.499 2.497 2.499
+score AMAZON_IMG_NOT_RCVD_AMZN              2.497 1.096 2.497 1.096
+score APOSTROPHE_TOCC                       0.998 0.999 0.998 0.999
 score APP_DEVELOPMENT_FREEM                 1.000 1.000 1.000 1.000
 score APP_DEVELOPMENT_NORDNS                1.000 1.000 1.000 1.000
+score ARC_SIGNED                            0.001 0.001 0.001 0.001
+score ARC_VALID                             0.001 0.001 0.001 0.001
 score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.001 2.299 0.001 2.299
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          1.422 2.065 1.422 2.065
 score BEBEE_IMG_NOT_RCVD_BB                 1.000 1.000 1.000 1.000
-score BIGNUM_EMAILS_FREEM                   2.999 2.999 2.999 2.999
-score BIGNUM_EMAILS_MANY                    3.000 2.823 3.000 2.823
+score BIGNUM_EMAILS_FREEM                   2.997 2.999 2.997 2.999
+score BIGNUM_EMAILS_MANY                    2.996 2.999 2.996 2.999
 score BITCOIN_BOMB                          1.000 1.000 1.000 1.000
 score BITCOIN_DEADLINE                      1.000 1.000 1.000 1.000
-score BITCOIN_EXTORT_01                     4.250 0.583 4.250 0.583
+score BITCOIN_EXTORT_01                     4.146 0.648 4.146 0.648
 score BITCOIN_EXTORT_02                     1.000 1.000 1.000 1.000
 score BITCOIN_IMGUR                         1.000 1.000 1.000 1.000
-score BITCOIN_MALF_HTML                     3.499 2.543 3.499 2.543
+score BITCOIN_MALF_HTML                     3.496 3.289 3.496 3.289
 score BITCOIN_MALWARE                       1.000 1.000 1.000 1.000
 score BITCOIN_OBFU_SUBJ                     1.000 1.000 1.000 1.000
-score BITCOIN_ONAN                          2.999 2.999 2.999 2.999
+score BITCOIN_ONAN                          2.996 2.999 2.996 2.999
 score BITCOIN_PAY_ME                        1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_01                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_02                       2.499 0.001 2.499 0.001
-score BITCOIN_SPAM_03                       2.499 2.499 2.499 2.499
+score BITCOIN_SPAM_02                       2.497 0.001 2.497 0.001
+score BITCOIN_SPAM_03                       2.497 2.499 2.497 2.499
 score BITCOIN_SPAM_04                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_05                       0.001 0.685 0.001 0.685
+score BITCOIN_SPAM_05                       0.001 0.434 0.001 0.434
 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_08                       1.000 1.000 1.000 1.000
@@ -60,34 +62,34 @@
 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                         2.499 0.001 2.499 0.001
+score BITCOIN_XPRIO                         2.497 0.001 2.497 0.001
 score BITCOIN_YOUR_INFO                     1.000 1.000 1.000 1.000
-score BODY_EMAIL_419_FRAUD_GM               2.500 2.499 2.500 2.499
-score BODY_SINGLE_URI                       0.001 0.001 0.001 0.001
+score BODY_EMAIL_419_FRAUD_GM               2.497 1.878 2.497 1.878
+score BODY_SINGLE_URI                       0.002 0.001 0.002 0.001
 score BODY_SINGLE_WORD                      0.001 0.001 0.001 0.001
-score BODY_URI_ONLY                         1.000 2.476 1.000 2.476
-score BOGUS_MIME_VERSION                    3.499 3.499 3.499 3.499
-score BOGUS_MSM_HDRS                        0.682 2.287 0.682 2.287
+score BODY_URI_ONLY                         1.000 2.313 1.000 2.313
+score BOGUS_MIME_VERSION                    3.496 3.499 3.496 3.499
+score BOGUS_MSM_HDRS                        1.915 2.777 1.915 2.777
 score BOMB_FREEM                            1.000 1.000 1.000 1.000
 score BOMB_MONEY                            1.000 1.000 1.000 1.000
 score BTC_ORG                               1.000 1.000 1.000 1.000
 score BULK_RE_SUSP_NTLD                     1.000 1.000 1.000 1.000
 score CANT_SEE_AD                           1.000 1.000 1.000 1.000
-score CK_HELO_GENERIC                       0.250 0.001 0.250 0.001
+score CK_HELO_GENERIC                       0.248 0.001 0.248 0.001
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
-score COMPENSATION                          0.001 1.499 0.001 1.499
-score CONTENT_AFTER_HTML                    2.499 2.124 2.499 2.124
-score CONTENT_AFTER_HTML_WEAK               1.499 1.499 1.499 1.499
-score CTE_8BIT_MISMATCH                     1.000 0.837 1.000 0.837
+score COMPENSATION                          1.000 1.343 1.000 1.343
+score CONTENT_AFTER_HTML                    2.497 1.615 2.497 1.615
+score CONTENT_AFTER_HTML_WEAK               1.498 1.499 1.498 1.499
+score CTE_8BIT_MISMATCH                     0.998 0.838 0.998 0.838
 score DAY_I_EARNED                          1.000 1.000 1.000 1.000
-score DEAR_BENEFICIARY                      3.054 2.899 3.054 2.899
+score DEAR_BENEFICIARY                      2.358 2.899 2.358 2.899
 score DKIMWL_BL                             0.001 1.000 0.001 1.000
 score DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
 score DKIMWL_WL_HIGH                        0.001 -0.573 0.001 -0.573
 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 DKIMWL_WL_MEDHI                       0.001 -0.107 0.001 -0.107
 score DOTGOV_IMAGE                          1.000 1.000 1.000 1.000
-score DX_TEXT_03                            1.199 1.299 1.199 1.299
+score DX_TEXT_03                            1.098 1.299 1.098 1.299
 score DYNAMIC_IMGUR                         1.000 1.000 1.000 1.000
 score EBAY_IMG_NOT_RCVD_EBAY                1.000 1.000 1.000 1.000
 score ENCRYPTED_MESSAGE                     -0.999 -0.999 -0.999 -0.999
@@ -96,130 +98,129 @@
 score FACEBOOK_IMG_NOT_RCVD_FB              1.000 1.000 1.000 1.000
 score FBI_MONEY                             1.000 1.000 1.000 1.000
 score FBI_SPOOF                             1.000 1.000 1.000 1.000
-score FILL_THIS_FORM                        1.699 1.464 1.699 1.464
-score FONT_INVIS_DIRECT                     1.607 0.001 1.607 0.001
+score FILL_THIS_FORM                        1.695 1.465 1.695 1.465
+score FONT_INVIS_DIRECT                     1.681 0.001 1.681 0.001
 score FONT_INVIS_DOTGOV                     1.000 1.000 1.000 1.000
-score FONT_INVIS_HTML_NOHTML                2.999 2.999 2.999 2.999
-score FONT_INVIS_LONG_LINE                  2.999 2.999 2.999 2.999
-score FONT_INVIS_MSGID                      1.236 0.045 1.236 0.045
+score FONT_INVIS_HTML_NOHTML                2.996 2.999 2.996 2.999
+score FONT_INVIS_LONG_LINE                  2.996 2.999 2.996 2.999
+score FONT_INVIS_MSGID                      1.644 0.001 1.644 0.001
 score FONT_INVIS_NORDNS                     1.000 1.000 1.000 1.000
-score FONT_INVIS_POSTEXTRAS                 1.602 1.783 1.602 1.783
-score FORGED_SPF_HELO                       0.001 0.107 0.001 0.107
+score FONT_INVIS_POSTEXTRAS                 1.592 2.086 1.592 2.086
 score FORM_FRAUD                            1.000 0.999 1.000 0.999
-score FORM_FRAUD_3                          0.001 0.200 0.001 0.200
 score FORM_FRAUD_5                          0.001 0.001 0.001 0.001
-score FOUND_YOU                             2.067 2.356 2.067 2.356
-score FREEMAIL_FORGED_FROMDOMAIN            0.249 0.250 0.249 0.250
+score FOUND_YOU                             2.505 2.338 2.505 2.338
+score FREEMAIL_FORGED_FROMDOMAIN            0.248 0.250 0.248 0.250
 score FREEM_FRNUM_UNICD_EMPTY               1.000 1.000 1.000 1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB            1.000 1.000 1.000 1.000
-score FROM_2_EMAILS_SHORT                   2.052 1.581 2.052 1.581
-score FROM_ADDR_WS                          2.999 2.999 2.999 2.999
+score FROM_2_EMAILS_SHORT                   2.044 2.012 2.044 2.012
+score FROM_ADDR_WS                          2.996 2.999 2.996 2.999
 score FROM_BANK_NOAUTH                      0.001 0.999 0.001 0.999
 score FROM_FMBLA_NDBLOCKED                  0.001 0.001 0.001 0.001
 score FROM_FMBLA_NEWDOM                     0.001 0.303 0.001 0.303
 score FROM_FMBLA_NEWDOM14                   0.001 0.999 0.001 0.999
 score FROM_FMBLA_NEWDOM28                   0.001 0.799 0.001 0.799
-score FROM_GOV_DKIM_AU                      0.001 -0.811 0.001 -0.811
+score FROM_GOV_DKIM_AU                      0.001 -0.495 0.001 -0.495
 score FROM_GOV_REPLYTO_FREEMAIL             0.001 1.000 0.001 1.000
 score FROM_GOV_SPOOF                        0.001 1.000 0.001 1.000
-score FROM_MISSPACED                        1.999 1.999 1.999 1.999
-score FROM_MISSP_DYNIP                      1.802 2.199 1.802 2.199
-score FROM_MISSP_EH_MATCH                   1.999 0.001 1.999 0.001
-score FROM_MISSP_FREEMAIL                   3.199 0.001 3.199 0.001
+score FROM_MISSPACED                        1.997 1.999 1.997 1.999
+score FROM_MISSP_DYNIP                      2.012 1.732 2.012 1.732
+score FROM_MISSP_EH_MATCH                   1.997 0.001 1.997 0.001
+score FROM_MISSP_FREEMAIL                   3.196 0.001 3.196 0.001
 score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
+score FROM_MISSP_REPLYTO                    1.000 0.001 1.000 0.001
 score FROM_MISSP_SPF_FAIL                   0.001 0.001 0.001 0.001
 score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
-score FROM_MULTI_NORDNS                     2.425 1.001 2.425 1.001
+score FROM_MULTI_NORDNS                     0.518 0.999 0.518 0.999
 score FROM_NEWDOM_BTC                       0.001 1.000 0.001 1.000
-score FROM_NTLD_LINKBAIT                    0.497 0.895 0.497 0.895
-score FROM_NTLD_REPLY_FREEMAIL              1.364 0.253 1.364 0.253
+score FROM_NTLD_LINKBAIT                    0.001 0.001 0.001 0.001
+score FROM_NTLD_REPLY_FREEMAIL              1.288 1.999 1.288 1.999
 score FROM_NUMBERO_NEWDOMAIN                0.001 1.000 0.001 1.000
-score FROM_PAYPAL_SPOOF                     0.001 1.456 0.001 1.456
-score FROM_SUSPICIOUS_NTLD                  0.500 0.001 0.500 0.001
-score FROM_SUSPICIOUS_NTLD_FP               2.000 1.999 2.000 1.999
+score FROM_PAYPAL_SPOOF                     0.001 0.417 0.001 0.417
+score FROM_SUSPICIOUS_NTLD                  0.498 0.001 0.498 0.001
+score FROM_SUSPICIOUS_NTLD_FP               1.997 1.999 1.997 1.999
 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_HELO_FAKE                         3.099 3.099 3.099 3.099
-score FSL_NEW_HELO_USER                     0.501 0.001 0.501 0.001
-score FUZZY_AMAZON                          2.400 2.299 2.400 2.299
+score FSL_HELO_FAKE                         3.196 3.099 3.196 3.099
+score FSL_NEW_HELO_USER                     0.832 0.001 0.832 0.001
+score FUZZY_AMAZON                          2.397 2.299 2.397 2.299
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
-score GB_FAKE_RF_SHORT                      1.999 1.999 1.999 1.999
+score GB_FAKE_RF_SHORT                      1.972 1.468 1.972 1.468
 score GB_FORGED_MUA_POSTFIX                 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO                    0.499 0.001 0.499 0.001
+score GB_FREEMAIL_DISPTO                    0.498 0.001 0.498 0.001
 score GB_FREEMAIL_DISPTO_NOTFREEM           0.500 0.500 0.500 0.500
 score GB_GOOGLE_OBFUR                       0.750 0.750 0.750 0.750
-score GB_HASHBL_BTC                         0.001 2.584 0.001 2.584
-score GB_URI_FLEEK_STO_HTM                  0.999 0.999 0.999 0.999
-score GB_WEBFORM                            1.499 1.500 1.499 1.500
+score GB_HASHBL_BTC                         0.001 2.500 0.001 2.500
+score GB_URI_FLEEK_STO_HTM                  0.998 1.000 0.998 1.000
+score GB_WEBFORM                            1.498 1.499 1.498 1.499
 score GOOGLE_DOCS_PHISH                     1.000 1.000 1.000 1.000
 score GOOGLE_DOCS_PHISH_MANY                1.000 1.000 1.000 1.000
 score GOOGLE_DOC_SUSP                       1.000 1.000 1.000 1.000
 score GOOGLE_DRIVE_REPLY_BAD_NTLD           1.000 1.000 1.000 1.000
 score GOOG_MALWARE_DNLD                     1.000 1.000 1.000 1.000
-score GOOG_REDIR_HTML_ONLY                  1.999 2.000 1.999 2.000
-score GOOG_REDIR_NORDNS                     2.500 3.299 2.500 3.299
-score GOOG_STO_EMAIL_PHISH                  2.999 2.999 2.999 2.999
+score GOOG_REDIR_HTML_ONLY                  1.997 1.999 1.997 1.999
+score GOOG_REDIR_NORDNS                     2.593 3.300 2.593 3.300
+score GOOG_STO_EMAIL_PHISH                  2.656 2.999 2.656 2.999
 score GOOG_STO_HTML_PHISH                   1.000 1.000 1.000 1.000
 score GOOG_STO_HTML_PHISH_MANY              1.000 1.000 1.000 1.000
 score GOOG_STO_IMG_HTML                     1.000 1.000 1.000 1.000
 score GOOG_STO_IMG_NOHTML                   1.000 1.000 1.000 1.000
-score GOOG_STO_NOIMG_HTML                   2.999 2.999 2.999 2.999
+score GOOG_STO_NOIMG_HTML                   2.997 2.999 2.997 2.999
 score HAS_X_NO_RELAY                        1.000 1.000 1.000 1.000
-score HAS_X_OUTGOING_SPAM_STAT              1.999 0.001 1.999 0.001
-score HDRS_LCASE                            0.001 0.099 0.001 0.099
-score HDRS_MISSP                            2.499 2.499 2.499 2.499
-score HDR_ORDER_FTSDMCXX_DIRECT             1.999 0.001 1.999 0.001
-score HDR_ORDER_FTSDMCXX_NORDNS             0.499 0.001 0.499 0.001
-score HEADER_FROM_DIFFERENT_DOMAINS         0.250 0.249 0.250 0.249
+score HAS_X_OUTGOING_SPAM_STAT              1.506 0.001 1.506 0.001
+score HDRS_LCASE                            0.100 0.099 0.100 0.099
+score HDRS_MISSP                            2.497 2.499 2.497 2.499
+score HDR_ORDER_FTSDMCXX_DIRECT             0.784 0.001 0.784 0.001
+score HDR_ORDER_FTSDMCXX_NORDNS             0.001 0.001 0.001 0.001
+score HEADER_FROM_DIFFERENT_DOMAINS         0.249 0.250 0.249 0.250
 score HELO_NO_DOMAIN                        0.001 0.001 0.001 0.001
 score HEXHASH_WORD                          1.000 1.000 1.000 1.000
 score HK_CTE_RAW                            1.000 1.000 1.000 1.000
-score HK_NAME_MR_MRS                        0.999 0.999 0.999 0.999
-score HK_RANDOM_ENVFROM                     0.999 0.999 0.999 0.999
+score HK_NAME_MR_MRS                        0.998 0.999 0.998 0.999
+score HK_RANDOM_ENVFROM                     0.998 0.999 0.998 0.999
 score HK_RANDOM_FROM                        0.999 0.999 0.999 0.999
-score HK_RANDOM_REPLYTO                     1.000 0.912 1.000 0.912
+score HK_RANDOM_REPLYTO                     0.998 0.909 0.998 0.909
 score HK_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
-score HK_SCAM                               0.798 0.001 0.798 0.001
-score HK_WIN                                0.939 0.254 0.939 0.254
-score HOSTED_IMG_DIRECT_MX                  3.499 2.399 3.499 2.399
+score HK_SCAM                               1.251 0.001 1.251 0.001
+score HK_WIN                                0.731 0.285 0.731 0.285
+score HOSTED_IMG_DIRECT_MX                  3.496 2.687 3.496 2.687
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM                      3.499 2.426 3.499 2.426
+score HOSTED_IMG_FREEM                      3.496 2.425 3.496 2.425
 score HOSTED_IMG_MULTI                      1.000 1.000 1.000 1.000
-score HOSTED_IMG_MULTI_PUB_01               2.999 2.999 2.999 2.999
-score HTML_ENTITY_ASCII                     2.999 2.999 2.999 2.999
+score HOSTED_IMG_MULTI_PUB_01               2.996 3.000 2.996 3.000
+score HTML_ENTITY_ASCII                     2.996 2.999 2.996 2.999
 score HTML_ENTITY_ASCII_TINY                1.000 1.000 1.000 1.000
-score HTML_OFF_PAGE                         2.999 2.999 2.999 2.999
+score HTML_OFF_PAGE                         2.996 3.000 2.996 3.000
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY                     1.000 1.647 1.000 1.647
+score HTML_SINGLET_MANY                     1.000 1.909 1.000 1.909
 score HTML_TEXT_INVISIBLE_FONT              1.000 1.999 1.000 1.999
-score HTML_TEXT_INVISIBLE_STYLE             1.930 2.453 1.930 2.453
-score IMG_ONLY_FM_DOM_INFO                  2.188 2.499 2.188 2.499
-score JH_SPAMMY_HEADERS                     3.499 3.500 3.499 3.500
+score HTML_TEXT_INVISIBLE_STYLE             1.885 2.455 1.885 2.455
+score IMG_ONLY_FM_DOM_INFO                  2.187 2.499 2.187 2.499
+score JH_SPAMMY_HEADERS                     3.496 3.499 3.496 3.499
 score JH_SPAMMY_PATTERN01                   1.000 1.000 1.000 1.000
 score JH_SPAMMY_PATTERN02                   1.000 1.000 1.000 1.000
-score KHOP_HELO_FCRDNS                      0.400 0.400 0.400 0.400
+score KHOP_HELO_FCRDNS                      0.400 0.399 0.400 0.399
 score LINKEDIN_IMG_NOT_RCVD_LNKN            1.000 1.000 1.000 1.000
-score LIST_PARTIAL_SHORT_MSG                2.499 2.163 2.499 2.163
+score LIST_PARTIAL_SHORT_MSG                2.497 2.154 2.497 2.154
 score LIST_PRTL_PUMPDUMP                    1.000 1.000 1.000 1.000
 score LIST_PRTL_SAME_USER                   1.000 1.000 1.000 1.000
-score LONG_HEX_URI                          2.999 1.517 2.999 1.517
-score LONG_IMG_URI                          1.888 1.876 1.888 1.876
-score LONG_INVISIBLE_TEXT                   2.292 1.821 2.292 1.821
+score LONG_HEX_URI                          2.997 1.531 2.997 1.531
+score LONG_IMG_URI                          1.935 1.912 1.935 1.912
+score LONG_INVISIBLE_TEXT                   2.312 2.355 2.312 2.355
 score LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
-score LOTTO_AGENT                           1.499 1.499 1.499 1.499
+score LOTTO_AGENT                           1.498 1.499 1.498 1.499
 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                        1.000 1.000 1.000 1.000
 score MALWARE_PASSWORD                      1.000 1.000 1.000 1.000
-score MANY_HDRS_LCASE                       0.001 0.100 0.001 0.100
-score MILLION_HUNDRED                       0.001 0.001 0.001 0.001
-score MILLION_USD                           1.434 1.999 1.434 1.999
-score MIMEOLE_DIRECT_TO_MX                  1.628 0.001 1.628 0.001
+score MALW_ATTACH                           2.098 0.001 2.098 0.001
+score MILLION_HUNDRED                       0.130 0.299 0.130 0.299
+score MILLION_USD                           1.997 1.999 1.997 1.999
+score MIMEOLE_DIRECT_TO_MX                  0.779 0.001 0.779 0.001
 score MIME_NO_TEXT                          1.000 1.000 1.000 1.000
 score MIXED_AREA_CASE                       1.000 1.000 1.000 1.000
 score MIXED_CENTER_CASE                     1.000 1.000 1.000 1.000
-score MIXED_ES                              2.699 0.771 2.699 0.771
+score MIXED_ES                              2.497 0.767 2.497 0.767
 score MIXED_FONT_CASE                       1.000 1.000 1.000 1.000
 score MIXED_HREF_CASE                       1.000 1.000 1.000 1.000
 score MIXED_IMG_CASE                        1.000 1.000 1.000 1.000
@@ -227,70 +228,81 @@
 score MONERO_EXTORT_01                      1.000 1.000 1.000 1.000
 score MONERO_MALWARE                        1.000 1.000 1.000 1.000
 score MONERO_PAY_ME                         1.000 1.000 1.000 1.000
-score MONEY_ATM_CARD                        0.001 0.428 0.001 0.428
-score MONEY_FORM                            0.086 0.001 0.086 0.001
-score MONEY_FORM_SHORT                      1.642 0.497 1.642 0.497
-score MONEY_FRAUD_3                         2.899 2.799 2.899 2.799
+score MONEY_ATM_CARD                        0.360 1.936 0.360 1.936
+score MONEY_FORM                            0.001 0.001 0.001 0.001
+score MONEY_FORM_SHORT                      2.497 0.508 2.497 0.508
+score MONEY_FRAUD_3                         2.897 2.799 2.897 2.799
 score MONEY_FRAUD_5                         0.001 0.001 0.001 0.001
-score MONEY_FRAUD_8                         2.268 2.781 2.268 2.781
-score MONEY_FREEMAIL_REPTO                  3.000 1.813 3.000 1.813
-score MONEY_FROM_41                         1.999 1.999 1.999 1.999
-score MONEY_FROM_MISSP                      2.000 0.424 2.000 0.424
+score MONEY_FRAUD_8                         1.707 2.147 1.707 2.147
+score MONEY_FREEMAIL_REPTO                  2.996 1.704 2.996 1.704
+score MONEY_FROM_41                         1.997 1.999 1.997 1.999
+score MONEY_FROM_MISSP                      1.997 0.282 1.997 0.282
 score MSGID_DOLLARS_URI_IMG                 1.000 1.000 1.000 1.000
 score MSGID_HDR_MALF                        1.000 1.000 1.000 1.000
-score MSGID_NOFQDN1                         1.150 0.001 1.150 0.001
+score MSGID_NOFQDN1                         1.149 0.001 1.149 0.001
 score MSMAIL_PRI_ABNORMAL                   0.001 0.001 0.001 0.001
-score MSM_PRIO_REPTO                        2.499 2.500 2.499 2.500
-score NAME_EMAIL_DIFF                       0.001 0.001 0.001 0.001
-score NA_DOLLARS                            1.499 0.001 1.499 0.001
+score MSM_PRIO_REPTO                        2.497 2.499 2.497 2.499
+score NAME_EMAIL_DIFF                       1.728 0.001 1.728 0.001
+score NA_DOLLARS                            1.498 0.001 1.498 0.001
 score NEWEGG_IMG_NOT_RCVD_NEGG              1.000 1.000 1.000 1.000
-score NEW_PRODUCTS                          0.800 0.987 0.800 0.987
+score NEW_PRODUCTS                          1.248 0.805 1.248 0.805
 score NICE_REPLY_A                          -0.001 -0.001 -0.001 -0.001
 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                    1.115 2.005 1.115 2.005
-score NUMBERONLY_BITCOIN_EXP                0.001 0.342 0.001 0.342
+score NSL_RCVD_FROM_USER                    0.178 0.001 0.178 0.001
+score NSL_RCVD_HELO_USER                    1.162 1.661 1.162 1.661
+score NUMBERONLY_BITCOIN_EXP                1.813 1.804 1.813 1.804
 score OBFU_BITCOIN                          1.000 1.000 1.000 1.000
-score OBFU_TEXT_ATTACH                      0.300 0.369 0.300 0.369
-score ODD_FREEM_REPTO                       2.999 2.943 2.999 2.943
-score PDS_BTC_ID                            0.499 0.500 0.499 0.500
-score PDS_BTC_MSGID                         0.001 0.001 0.001 0.001
-score PDS_DBL_URL_TNB_RUNON                 1.999 1.999 1.999 1.999
+score OBFU_TEXT_ATTACH                      0.885 0.924 0.885 0.924
+score ODD_FREEM_REPTO                       2.996 2.943 2.996 2.943
+score PDS_BTC_ID                            0.498 0.499 0.498 0.499
+score PDS_BTC_MSGID                         0.437 0.001 0.437 0.001
+score PDS_DBL_URL_TNB_RUNON                 1.998 2.000 1.998 2.000
+score PDS_FROM_2_EMAILS                     1.000 0.001 1.000 0.001
 score PDS_HELO_SPF_FAIL                     0.001 1.999 0.001 1.999
-score PDS_NAKED_TO_NUMERO                   0.001 1.999 0.001 1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL          0.749 0.749 0.749 0.749
-score PDS_OTHER_BAD_TLD                     1.999 1.999 1.999 1.999
-score PDS_SHORT_SPOOFED_URL                 1.999 2.000 1.999 2.000
-score PDS_TINYSUBJ_URISHRT                  0.200 1.089 0.200 1.089
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.999 1.655 1.999 1.655
-score PDS_TONAME_EQ_TOLOCAL_VSHORT          0.999 0.001 0.999 0.001
+score PDS_NAKED_TO_NUMERO                   1.463 1.999 1.463 1.999
+score PDS_NO_FULL_NAME_SPOOFED_URL          0.748 0.749 0.748 0.749
+score PDS_OTHER_BAD_TLD                     1.998 1.999 1.998 1.999
+score PDS_SHORT_SPOOFED_URL                 1.997 1.999 1.997 1.999
+score PDS_TINYSUBJ_URISHRT                  0.246 0.987 0.246 0.987
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.997 1.652 1.997 1.652
+score PDS_TONAME_EQ_TOLOCAL_VSHORT          0.998 0.001 0.998 0.001
 score PHISH_AZURE_CLOUDAPP                  3.500 3.500 3.500 3.500
 score PHISH_FBASEAPP                        1.000 1.000 1.000 1.000
 score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT                       2.499 2.156 2.499 2.156
-score PHP_SCRIPT                            2.499 2.275 2.499 2.275
+score PHP_ORIG_SCRIPT                       2.497 2.162 2.497 2.162
+score PHP_SCRIPT                            2.498 2.273 2.498 2.273
 score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT               0.999 0.999 0.999 0.999
+score PP_MIME_FAKE_ASCII_TEXT               0.998 0.999 0.998 0.999
 score PP_TOO_MUCH_UNICODE02                 0.500 0.500 0.500 0.500
 score PP_TOO_MUCH_UNICODE05                 1.000 1.000 1.000 1.000
 score PUMPDUMP                              1.000 1.000 1.000 1.000
 score PUMPDUMP_MULTI                        1.000 1.000 1.000 1.000
 score RAND_HEADER_LIST_SPOOF                1.000 1.000 1.000 1.000
-score RAND_HEADER_MANY                      2.999 2.999 2.999 2.999
-score RAND_MKTG_HEADER                      1.999 1.999 1.999 1.999
-score RATWARE_NO_RDNS                       1.621 0.444 1.621 0.444
+score RAND_HEADER_MANY                      2.996 2.999 2.996 2.999
+score RAND_MKTG_HEADER                      1.998 1.999 1.998 1.999
+score RATWARE_NO_RDNS                       1.706 1.659 1.706 1.659
 score RCVD_DOTEDU_SHORT                     1.000 1.000 1.000 1.000
 score RCVD_DOTEDU_SUSP_URI                  1.000 1.000 1.000 1.000
+score RCVD_IN_MSPIKE_BL                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_H2                     0.001 -0.001 0.001 -0.001
+score RCVD_IN_MSPIKE_H3                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_H4                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_H5                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L2                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L3                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L4                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L5                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_WL                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_ZBI                    0.001 0.001 0.001 0.001
 score RDNS_NUM_TLD_ATCHNX                   1.000 1.000 1.000 1.000
-score RDNS_NUM_TLD_XM                       1.468 0.991 1.468 0.991
-score REPLYTO_EMPTY                         0.001 2.099 0.001 2.099
+score RDNS_NUM_TLD_XM                       0.346 2.271 0.346 2.271
+score REPLYTO_EMPTY                         2.197 2.100 2.197 2.100
 score REPTO_419_FRAUD                       1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL                   1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL_LOOSE             1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_CNS                   1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_GM                    2.999 2.999 2.999 2.999
-score REPTO_419_FRAUD_GM_LOOSE              0.999 0.999 0.999 0.999
+score REPTO_419_FRAUD_GM                    2.996 2.999 2.996 2.999
+score REPTO_419_FRAUD_GM_LOOSE              0.998 0.999 0.998 0.999
 score REPTO_419_FRAUD_HM                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_OL                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_PM                    1.000 1.000 1.000 1.000
@@ -300,91 +312,93 @@
 score REPTO_419_FRAUD_YJ                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_YN                    1.000 1.000 1.000 1.000
 score REPTO_INFONUMSCOM                     1.000 1.000 1.000 1.000
-score RISK_FREE                             0.760 1.630 0.760 1.630
+score RISK_FREE                             0.599 0.928 0.599 0.928
 score SCC_BODY_SINGLE_WORD                  0.001 0.001 0.001 0.001
-score SCC_BODY_URI_ONLY                     2.699 1.145 2.699 1.145
-score SCC_CANSPAM_2                         3.000 2.799 3.000 2.799
-score SCC_ISEMM_LID_1                       3.040 1.780 3.040 1.780
-score SCC_SPAMMER_ADDR_2                    2.399 2.299 2.399 2.299
-score SCC_THREE_WORD_MONTY                  3.000 2.899 3.000 2.899
-score SENDGRID_REDIR                        1.499 1.499 1.499 1.499
+score SCC_BODY_URI_ONLY                     2.696 1.274 2.696 1.274
+score SCC_CANSPAM_2                         2.896 2.799 2.896 2.799
+score SCC_ISEMM_LID_1                       2.280 2.587 2.280 2.587
+score SCC_SPAMMER_ADDR_2                    2.297 2.199 2.297 2.199
+score SCC_THREE_WORD_MONTY                  2.996 2.899 2.996 2.899
+score SENDGRID_REDIR                        1.498 1.499 1.498 1.499
 score SENDGRID_REDIR_PHISH                  1.000 1.000 1.000 1.000
 score SEO_SUSP_NTLD                         1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_VIAGRA01               4.166 3.599 4.166 3.599
-score SHOPIFY_IMG_NOT_RCVD_SFY              0.750 0.001 0.750 0.001
-score SHORTENED_URL_SRC                     2.299 2.199 2.299 2.199
-score SHORTENER_SHORT_IMG                   1.000 0.291 1.000 0.291
+score SERGIO_SUBJECT_VIAGRA01               3.559 4.120 3.559 4.120
+score SHOPIFY_IMG_NOT_RCVD_SFY              0.996 0.001 0.996 0.001
+score SHORTENED_URL_SRC                     2.198 2.199 2.198 2.199
+score SHORTENER_SHORT_IMG                   0.001 0.160 0.001 0.160
 score SHORT_IMG_SUSP_NTLD                   1.000 1.000 1.000 1.000
-score SHORT_SHORTNER                        1.999 1.999 1.999 1.999
+score SHORT_SHORTNER                        1.997 1.999 1.997 1.999
 score SPOOFED_FREEMAIL                      0.001 1.999 0.001 1.999
 score SPOOFED_FREEMAIL_NO_RDNS              1.000 0.001 1.000 0.001
-score SPOOFED_FREEM_REPTO                   0.001 2.122 0.001 2.122
-score SPOOFED_FREEM_REPTO_CHN               0.001 3.499 0.001 3.499
+score SPOOFED_FREEM_REPTO                   0.001 2.082 0.001 2.082
+score SPOOFED_FREEM_REPTO_CHN               0.001 3.369 0.001 3.369
 score SPOOFED_FREEM_REPTO_RUS               0.001 1.000 0.001 1.000
 score SPOOF_GMAIL_MID                       1.000 0.001 1.000 0.001
-score STATIC_XPRIO_OLE                      0.001 0.001 0.001 0.001
+score STATIC_XPRIO_OLE                      0.008 0.001 0.008 0.001
 score STOCK_TIP                             1.000 1.000 1.000 1.000
 score SUBJ_BRKN_WORDNUMS                    1.000 1.000 1.000 1.000
+score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
 score SYSADMIN                              1.000 1.000 1.000 1.000
 score TAGSTAT_IMG_NOT_RCVD_TGST             1.000 1.000 1.000 1.000
 score TARINGANET_IMG_NOT_RCVD_TN            1.000 1.000 1.000 1.000
-score THIS_AD                               1.099 1.099 1.099 1.099
+score THIS_AD                               1.199 1.099 1.199 1.099
 score THIS_IS_ADV_SUSP_NTLD                 1.000 1.000 1.000 1.000
 score TONLINE_FAKE_DKIM                     1.000 1.000 1.000 1.000
-score TONOM_EQ_TOLOC_SHRT_SHRTNER           0.001 0.028 0.001 0.028
+score TONOM_EQ_TOLOC_SHRT_SHRTNER           0.001 0.001 0.001 0.001
 score TO_EQ_FM_DIRECT_MX                    1.000 1.000 1.000 1.000
 score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
 score TO_EQ_FM_SPF_FAIL                     0.001 0.001 0.001 0.001
 score TO_IN_SUBJ                            0.100 0.100 0.100 0.100
 score TO_NAME_SUBJ_NO_RDNS                  1.000 1.000 1.000 1.000
-score TO_NO_BRKTS_FROM_MSSP                 2.499 2.499 2.499 2.499
-score TO_NO_BRKTS_HTML_IMG                  1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_HTML_ONLY                 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_NORDNS_HTML               1.999 1.205 1.999 1.205
-score TO_NO_BRKTS_PCNT                      2.499 2.499 2.499 2.499
-score TVD_RCVD_SPACE_BRACKET                1.617 2.791 1.617 2.791
-score TVD_SUBJ_NUM_OBFU_MINFP               0.001 2.199 0.001 2.199
+score TO_NO_BRKTS_FROM_MSSP                 2.497 2.500 2.497 2.500
+score TO_NO_BRKTS_HTML_IMG                  1.997 1.999 1.997 1.999
+score TO_NO_BRKTS_HTML_ONLY                 1.997 1.999 1.997 1.999
+score TO_NO_BRKTS_NORDNS_HTML               1.787 1.204 1.787 1.204
+score TO_NO_BRKTS_PCNT                      2.497 2.499 2.497 2.499
+score TVD_RCVD_SPACE_BRACKET                0.636 2.133 0.636 2.133
+score TVD_SPACE_ENCODED                     1.000 0.001 1.000 0.001
+score TVD_SPACE_RATIO_MINFP                 1.000 0.001 1.000 0.001
 score TW_GIBBERISH_MANY                     1.000 1.000 1.000 1.000
 score UC_GIBBERISH_OBFU                     1.000 1.000 1.000 1.000
-score UNDISC_FREEM                          3.299 3.099 3.299 3.099
-score UNDISC_MONEY                          3.199 2.923 3.199 2.923
-score UNICODE_OBFU_ASC                      2.499 2.499 2.499 2.499
+score UNDISC_FREEM                          3.297 3.099 3.297 3.099
+score UNDISC_MONEY                          3.196 2.983 3.196 2.983
+score UNICODE_OBFU_ASC                      2.497 2.499 2.497 2.499
 score UNICODE_OBFU_ZW                       1.000 1.000 1.000 1.000
 score UNSUB_GOOG_FORM                       1.000 1.000 1.000 1.000
 score URI_ADOBESPARK                        1.000 1.000 1.000 1.000
 score URI_AZURE_CLOUDAPP                    1.000 1.000 1.000 1.000
 score URI_DASHGOVEDU                        1.000 1.000 1.000 1.000
 score URI_DATA                              1.000 1.000 1.000 1.000
-score URI_DOTEDU                            1.999 2.000 1.999 2.000
+score URI_DOTEDU                            1.997 1.999 1.997 1.999
 score URI_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
-score URI_FIREBASEAPP                       2.999 2.999 2.999 2.999
-score URI_GOOGLE_PROXY                      2.499 2.299 2.499 2.299
+score URI_FIREBASEAPP                       2.996 2.999 2.996 2.999
+score URI_GOOGLE_PROXY                      2.297 2.300 2.297 2.300
 score URI_GOOG_STO_SPAMMY                   3.000 3.000 3.000 3.000
 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_IN_URI_10                         2.699 2.499 2.699 2.499
+score URI_IN_URI_10                         2.497 2.499 2.497 2.499
 score URI_LONG_REPEAT                       1.000 1.000 1.000 1.000
-score URI_ONLY_MSGID_MALF                   1.000 1.375 1.000 1.375
+score URI_ONLY_MSGID_MALF                   1.000 1.405 1.000 1.405
 score URI_OPTOUT_3LD                        1.000 1.000 1.000 1.000
-score URI_PHISH                             3.999 2.376 3.999 2.376
-score URI_PHP_REDIR                         3.499 3.298 3.499 3.298
-score URI_TRY_3LD                           1.949 1.999 1.949 1.999
+score URI_PHISH                             3.995 2.380 3.995 2.380
+score URI_PHP_REDIR                         3.496 3.296 3.496 3.296
+score URI_TRY_3LD                           1.998 1.999 1.998 1.999
 score URI_TRY_USME                          1.000 1.000 1.000 1.000
-score URI_WPADMIN                           2.400 2.299 2.400 2.299
-score URI_WP_DIRINDEX                       3.499 3.489 3.499 3.489
+score URI_WPADMIN                           2.397 2.299 2.397 2.299
+score URI_WP_DIRINDEX                       3.496 3.496 3.496 3.496
 score URI_WP_HACKED                         1.000 3.499 1.000 3.499
-score URI_WP_HACKED_2                       2.499 1.596 2.499 1.596
+score URI_WP_HACKED_2                       2.498 1.596 2.498 1.596
 score USB_DRIVES                            1.000 1.000 1.000 1.000
 score VFY_ACCT_NORDNS                       1.000 1.000 1.000 1.000
 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.000 1.000 1.000 1.000
 score WORD_INVIS                            0.001 1.000 0.001 1.000
-score WORD_INVIS_MANY                       2.999 2.999 2.999 2.999
+score WORD_INVIS_MANY                       2.996 2.999 2.996 2.999
 score XM_DIGITS_ONLY                        1.000 1.000 1.000 1.000
-score XM_RANDOM                             2.499 2.499 2.499 2.499
-score XM_RECPTID                            2.999 2.999 2.999 2.999
+score XM_RANDOM                             2.497 2.499 2.497 2.499
+score XM_RECPTID                            2.996 3.000 2.996 3.000
 score XPRIO                                 1.000 0.001 1.000 0.001
-score XPRIO_SHORT_SUBJ                      2.500 2.340 2.500 2.340
-score YOUR_DELIVERY_ADDRESS                 1.250 1.250 1.250 1.250
-score YOU_INHERIT                           2.553 2.499 2.553 2.499
+score XPRIO_SHORT_SUBJ                      1.000 0.036 1.000 0.036
+score YOUR_DELIVERY_ADDRESS                 1.248 1.249 1.248 1.249
+score YOU_INHERIT                           2.497 2.500 2.497 2.500
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index 422d4bf..be42d85 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,191 +1,197 @@
-# Using score set 0 logs for revision 1903234 from:
-# ham-ena-week0.r1903234.log ham-ena-week1.r1903234.log ham-ena-week2.r1903234.log ham-ena-week3.r1903234.log ham-ena-week4.r1903234.log ham-giovanni-ham.r1903234.log ham-giovanni-spammy.r1903234.log ham-giovanni-spam.r1903234.log ham-grenier.r1903234.log ham-hege.r1903234.log ham-jhardin.r1903234.log ham-llanga.r1903234.log ham-mmiroslaw-mails-ham.r1903234.log ham-mmiroslaw-mails-spam.r1903234.log ham-spamsponge.r1903234.log ham-thendrikx.r1903234.log ham-tsz-spam-corpus.r1903234.log spam-ena-week0.r1903234.log spam-ena-week1.r1903234.log spam-ena-week2.r1903234.log spam-ena-week3.r1903234.log spam-ena-week4.r1903234.log spam-giovanni-ham.r1903234.log spam-giovanni-spammy.r1903234.log spam-giovanni-spam.r1903234.log spam-grenier.r1903234.log spam-hege.r1903234.log spam-jhardin.r1903234.log spam-llanga.r1903234.log spam-mmiroslaw-mails-ham.r1903234.log spam-mmiroslaw-mails-spam.r1903234.log spam-spamsponge.r1903234.log spam-thendrikx.r1903234.log spam-tsz-spam-corpus.r1903234.log
+# Using score set 0 logs for revision 1903264 from:
+# ham-ena-week0.r1903264.log ham-ena-week1.r1903264.log ham-ena-week2.r1903264.log ham-ena-week3.r1903264.log ham-ena-week4.r1903264.log ham-giovanni-ham.r1903264.log ham-giovanni-spammy.r1903264.log ham-giovanni-spam.r1903264.log ham-grenier.r1903264.log ham-hege.r1903264.log ham-jhardin.r1903264.log ham-llanga.r1903264.log ham-mmiroslaw-mails-ham.r1903264.log ham-mmiroslaw-mails-spam.r1903264.log ham-thendrikx.r1903264.log ham-tsz-spam-corpus.r1903264.log spam-ena-week0.r1903264.log spam-ena-week1.r1903264.log spam-ena-week2.r1903264.log spam-ena-week3.r1903264.log spam-ena-week4.r1903264.log spam-giovanni-ham.r1903264.log spam-giovanni-spammy.r1903264.log spam-giovanni-spam.r1903264.log spam-grenier.r1903264.log spam-hege.r1903264.log spam-jhardin.r1903264.log spam-llanga.r1903264.log spam-mmiroslaw-mails-ham.r1903264.log spam-mmiroslaw-mails-spam.r1903264.log spam-thendrikx.r1903264.log spam-tsz-spam-corpus.r1903264.log
 
 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                    3.099
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.860
-score ADVANCE_FEE_2_NEW_MONEY        0.878
-score ADVANCE_FEE_3_NEW              3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY      2.299
-score ADVANCE_FEE_3_NEW_MONEY        2.799
-score ADVANCE_FEE_4_NEW              2.199
-score ADVANCE_FEE_4_NEW_FRM_MNY      2.500
-score ADVANCE_FEE_4_NEW_MONEY        0.990
-score ADVANCE_FEE_5_NEW              2.400
+score AC_FROM_MANY_DOTS              2.996
+score AC_HTML_NONSENSE_TAGS          1.997
+score ADMITS_SPAM                    3.196
+score ADVANCE_FEE_2_NEW_FRM_MNY      0.532
+score ADVANCE_FEE_2_NEW_MONEY        1.997
+score ADVANCE_FEE_3_NEW              3.496
+score ADVANCE_FEE_3_NEW_FRM_MNY      2.297
+score ADVANCE_FEE_3_NEW_MONEY        2.796
+score ADVANCE_FEE_4_NEW              2.197
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.397
+score ADVANCE_FEE_4_NEW_MONEY        1.489
+score ADVANCE_FEE_5_NEW              2.398
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_5_NEW_MONEY        0.001
-score AD_PREFS                       0.001
-score ALIBABA_IMG_NOT_RCVD_ALI       2.499
-score AMAZON_IMG_NOT_RCVD_AMZN       2.499
-score APOSTROPHE_TOCC                0.999
+score AD_PREFS                       0.230
+score ALIBABA_IMG_NOT_RCVD_ALI       2.497
+score AMAZON_IMG_NOT_RCVD_AMZN       2.497
+score APOSTROPHE_TOCC                0.998
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score BIGNUM_EMAILS_FREEM            2.999
-score BIGNUM_EMAILS_MANY             3.000
-score BITCOIN_EXTORT_01              4.250
-score BITCOIN_MALF_HTML              3.499
-score BITCOIN_ONAN                   2.999
-score BITCOIN_SPAM_02                2.499
-score BITCOIN_SPAM_03                2.499
-score BITCOIN_XPRIO                  2.499
-score BODY_EMAIL_419_FRAUD_GM        2.500
-score BODY_SINGLE_URI                0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.422
+score BIGNUM_EMAILS_FREEM            2.997
+score BIGNUM_EMAILS_MANY             2.996
+score BITCOIN_EXTORT_01              4.146
+score BITCOIN_MALF_HTML              3.496
+score BITCOIN_ONAN                   2.996
+score BITCOIN_SPAM_02                2.497
+score BITCOIN_SPAM_03                2.497
+score BITCOIN_XPRIO                  2.497
+score BODY_EMAIL_419_FRAUD_GM        2.497
+score BODY_SINGLE_URI                0.002
 score BODY_SINGLE_WORD               0.001
-score BOGUS_MIME_VERSION             3.499
-score BOGUS_MSM_HDRS                 0.682
-score CK_HELO_GENERIC                0.250
-score CONTENT_AFTER_HTML             2.499
-score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              1.000
-score DEAR_BENEFICIARY               3.054
-score DX_TEXT_03                     1.199
+score BOGUS_MIME_VERSION             3.496
+score BOGUS_MSM_HDRS                 1.915
+score CK_HELO_GENERIC                0.248
+score CONTENT_AFTER_HTML             2.497
+score CONTENT_AFTER_HTML_WEAK        1.498
+score CTE_8BIT_MISMATCH              0.998
+score DEAR_BENEFICIARY               2.358
+score DX_TEXT_03                     1.098
 score ENCRYPTED_MESSAGE              -0.999
-score FILL_THIS_FORM                 1.699
-score FONT_INVIS_DIRECT              1.607
-score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               1.236
-score FONT_INVIS_POSTEXTRAS          1.602
-score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      2.067
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROM_2_EMAILS_SHORT            2.052
-score FROM_ADDR_WS                   2.999
-score FROM_MISSPACED                 1.999
-score FROM_MISSP_DYNIP               1.802
-score FROM_MISSP_EH_MATCH            1.999
-score FROM_MISSP_FREEMAIL            3.199
+score FILL_THIS_FORM                 1.695
+score FONT_INVIS_DIRECT              1.681
+score FONT_INVIS_HTML_NOHTML         2.996
+score FONT_INVIS_LONG_LINE           2.996
+score FONT_INVIS_MSGID               1.644
+score FONT_INVIS_POSTEXTRAS          1.592
+score FORM_FRAUD_5                   0.001 # force non-zero
+score FOUND_YOU                      2.505
+score FREEMAIL_FORGED_FROMDOMAIN     0.248
+score FROM_2_EMAILS_SHORT            2.044
+score FROM_ADDR_WS                   2.996
+score FROM_MISSPACED                 1.997
+score FROM_MISSP_DYNIP               2.012
+score FROM_MISSP_EH_MATCH            1.997
+score FROM_MISSP_FREEMAIL            3.196
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              2.425
-score FROM_NTLD_LINKBAIT             0.497
-score FROM_NTLD_REPLY_FREEMAIL       1.364
-score FROM_SUSPICIOUS_NTLD           0.500
-score FROM_SUSPICIOUS_NTLD_FP        2.000
-score FSL_CTYPE_WIN1251              0.001 # force non-zero
-score FSL_HELO_FAKE                  3.099
-score FSL_NEW_HELO_USER              0.501
-score FUZZY_AMAZON                   2.400
-score GB_FAKE_RF_SHORT               1.999
-score GB_FREEMAIL_DISPTO             0.499
-score GB_URI_FLEEK_STO_HTM           0.999
-score GB_WEBFORM                     1.499
-score GOOG_REDIR_HTML_ONLY           1.999
-score GOOG_REDIR_NORDNS              2.500
-score GOOG_STO_EMAIL_PHISH           2.999
-score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       1.999
-score HDRS_MISSP                     2.499
-score HDR_ORDER_FTSDMCXX_DIRECT      1.999
-score HDR_ORDER_FTSDMCXX_NORDNS      0.499
-score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score FROM_MULTI_NORDNS              0.518
+score FROM_NTLD_LINKBAIT             0.001
+score FROM_NTLD_REPLY_FREEMAIL       1.288
+score FROM_SUSPICIOUS_NTLD           0.498
+score FROM_SUSPICIOUS_NTLD_FP        1.997
+score FSL_CTYPE_WIN1251              0.001
+score FSL_HELO_FAKE                  3.196
+score FSL_NEW_HELO_USER              0.832
+score FUZZY_AMAZON                   2.397
+score GB_FAKE_RF_SHORT               1.972
+score GB_FREEMAIL_DISPTO             0.498
+score GB_URI_FLEEK_STO_HTM           0.998
+score GB_WEBFORM                     1.498
+score GOOG_REDIR_HTML_ONLY           1.997
+score GOOG_REDIR_NORDNS              2.593
+score GOOG_STO_EMAIL_PHISH           2.656
+score GOOG_STO_NOIMG_HTML            2.997
+score HAS_X_OUTGOING_SPAM_STAT       1.506
+score HDRS_MISSP                     2.497
+score HDR_ORDER_FTSDMCXX_DIRECT      0.784
+score HDR_ORDER_FTSDMCXX_NORDNS      0.001
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
-score HK_NAME_MR_MRS                 0.999
-score HK_RANDOM_ENVFROM              0.999
+score HK_NAME_MR_MRS                 0.998
+score HK_RANDOM_ENVFROM              0.998
 score HK_RANDOM_FROM                 0.999
-score HK_RANDOM_REPLYTO              1.000
-score HK_SCAM                        0.798
-score HK_WIN                         0.939
-score HOSTED_IMG_DIRECT_MX           3.499
-score HOSTED_IMG_FREEM               3.499
-score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_ENTITY_ASCII              2.999
-score HTML_OFF_PAGE                  2.999
-score HTML_TEXT_INVISIBLE_STYLE      1.930
-score IMG_ONLY_FM_DOM_INFO           2.188
-score JH_SPAMMY_HEADERS              3.499
-score LIST_PARTIAL_SHORT_MSG         2.499
-score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   1.888
-score LONG_INVISIBLE_TEXT            2.292
+score HK_RANDOM_REPLYTO              0.998
+score HK_SCAM                        1.251
+score HK_WIN                         0.731
+score HOSTED_IMG_DIRECT_MX           3.496
+score HOSTED_IMG_FREEM               3.496
+score HOSTED_IMG_MULTI_PUB_01        2.996
+score HTML_ENTITY_ASCII              2.996
+score HTML_OFF_PAGE                  2.996
+score HTML_TEXT_INVISIBLE_STYLE      1.885
+score IMG_ONLY_FM_DOM_INFO           2.187
+score JH_SPAMMY_HEADERS              3.496
+score LIST_PARTIAL_SHORT_MSG         2.497
+score LONG_HEX_URI                   2.997
+score LONG_IMG_URI                   1.935
+score LONG_INVISIBLE_TEXT            2.312
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.499
+score LOTTO_AGENT                    1.498
 score LOTTO_DEPT                     0.001
-score MILLION_HUNDRED                0.001
-score MILLION_USD                    1.434
-score MIMEOLE_DIRECT_TO_MX           1.628
-score MIXED_ES                       2.699
-score MONEY_ATM_CARD                 0.001 # force non-zero
-score MONEY_FORM                     0.086
-score MONEY_FORM_SHORT               1.642
-score MONEY_FRAUD_3                  2.899
+score MALW_ATTACH                    2.098
+score MILLION_HUNDRED                0.130
+score MILLION_USD                    1.997
+score MIMEOLE_DIRECT_TO_MX           0.779
+score MIXED_ES                       2.497
+score MONEY_ATM_CARD                 0.360
+score MONEY_FORM                     0.001 # force non-zero
+score MONEY_FORM_SHORT               2.497
+score MONEY_FRAUD_3                  2.897
 score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  2.268
-score MONEY_FREEMAIL_REPTO           3.000
-score MONEY_FROM_41                  1.999
-score MONEY_FROM_MISSP               2.000
-score MSGID_NOFQDN1                  1.150
+score MONEY_FRAUD_8                  1.707
+score MONEY_FREEMAIL_REPTO           2.996
+score MONEY_FROM_41                  1.997
+score MONEY_FROM_MISSP               1.997
+score MSGID_NOFQDN1                  1.149
 score MSMAIL_PRI_ABNORMAL            0.001
-score MSM_PRIO_REPTO                 2.499
-score NA_DOLLARS                     1.499
-score NEW_PRODUCTS                   0.800
+score MSM_PRIO_REPTO                 2.497
+score NAME_EMAIL_DIFF                1.728
+score NA_DOLLARS                     1.498
+score NEW_PRODUCTS                   1.248
 score NICE_REPLY_A                   -0.001
 score NO_FM_NAME_IP_HOSTN            0.001
-score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             1.115
-score OBFU_TEXT_ATTACH               0.300
-score ODD_FREEM_REPTO                2.999
-score PDS_BTC_ID                     0.499
-score PDS_BTC_MSGID                  0.001
-score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL   0.749
-score PDS_OTHER_BAD_TLD              1.999
-score PDS_SHORT_SPOOFED_URL          1.999
-score PDS_TINYSUBJ_URISHRT           0.200
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.999
-score PHP_ORIG_SCRIPT                2.499
-score PHP_SCRIPT                     2.499
-score PP_MIME_FAKE_ASCII_TEXT        0.999
-score RAND_HEADER_MANY               2.999
-score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                1.621
-score RDNS_NUM_TLD_XM                1.468
-score REPTO_419_FRAUD_GM             2.999
-score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      0.760
+score NSL_RCVD_FROM_USER             0.178
+score NSL_RCVD_HELO_USER             1.162
+score NUMBERONLY_BITCOIN_EXP         1.813
+score OBFU_TEXT_ATTACH               0.885
+score ODD_FREEM_REPTO                2.996
+score PDS_BTC_ID                     0.498
+score PDS_BTC_MSGID                  0.437
+score PDS_DBL_URL_TNB_RUNON          1.998
+score PDS_NAKED_TO_NUMERO            1.463
+score PDS_NO_FULL_NAME_SPOOFED_URL   0.748
+score PDS_OTHER_BAD_TLD              1.998
+score PDS_SHORT_SPOOFED_URL          1.997
+score PDS_TINYSUBJ_URISHRT           0.246
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
+score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.998
+score PHP_ORIG_SCRIPT                2.497
+score PHP_SCRIPT                     2.498
+score PP_MIME_FAKE_ASCII_TEXT        0.998
+score RAND_HEADER_MANY               2.996
+score RAND_MKTG_HEADER               1.998
+score RATWARE_NO_RDNS                1.706
+score RDNS_NUM_TLD_XM                0.346
+score REPLYTO_EMPTY                  2.197
+score REPTO_419_FRAUD_GM             2.996
+score REPTO_419_FRAUD_GM_LOOSE       0.998
+score RISK_FREE                      0.599
 score SCC_BODY_SINGLE_WORD           0.001
-score SCC_BODY_URI_ONLY              2.699
-score SCC_CANSPAM_2                  3.000
-score SCC_ISEMM_LID_1                3.040
-score SCC_SPAMMER_ADDR_2             2.399
-score SCC_THREE_WORD_MONTY           3.000
-score SENDGRID_REDIR                 1.499
-score SERGIO_SUBJECT_VIAGRA01        4.166
-score SHOPIFY_IMG_NOT_RCVD_SFY       0.750
-score SHORTENED_URL_SRC              2.299
-score SHORT_SHORTNER                 1.999
-score STATIC_XPRIO_OLE               0.001
-score THIS_AD                        1.099
-score TONOM_EQ_TOLOC_SHRT_SHRTNER    0.001 # force non-zero
-score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.999
-score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_NORDNS_HTML        1.999
-score TO_NO_BRKTS_PCNT               2.499
-score TVD_RCVD_SPACE_BRACKET         1.617
-score UNDISC_FREEM                   3.299
-score UNDISC_MONEY                   3.199
-score UNICODE_OBFU_ASC               2.499
-score URI_DOTEDU                     1.999
-score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               2.499
-score URI_IN_URI_10                  2.699
-score URI_PHISH                      3.999
-score URI_PHP_REDIR                  3.499
-score URI_TRY_3LD                    1.949
-score URI_WPADMIN                    2.400
-score URI_WP_DIRINDEX                3.499
-score URI_WP_HACKED_2                2.499
+score SCC_BODY_URI_ONLY              2.696
+score SCC_CANSPAM_2                  2.896
+score SCC_ISEMM_LID_1                2.280
+score SCC_SPAMMER_ADDR_2             2.297
+score SCC_THREE_WORD_MONTY           2.996
+score SENDGRID_REDIR                 1.498
+score SERGIO_SUBJECT_VIAGRA01        3.559
+score SHOPIFY_IMG_NOT_RCVD_SFY       0.996
+score SHORTENED_URL_SRC              2.198
+score SHORTENER_SHORT_IMG            0.001
+score SHORT_SHORTNER                 1.997
+score STATIC_XPRIO_OLE               0.008
+score THIS_AD                        1.199
+score TONOM_EQ_TOLOC_SHRT_SHRTNER    0.001
+score TO_NO_BRKTS_FROM_MSSP          2.497
+score TO_NO_BRKTS_HTML_IMG           1.997
+score TO_NO_BRKTS_HTML_ONLY          1.997
+score TO_NO_BRKTS_NORDNS_HTML        1.787
+score TO_NO_BRKTS_PCNT               2.497
+score TVD_RCVD_SPACE_BRACKET         0.636
+score UNDISC_FREEM                   3.297
+score UNDISC_MONEY                   3.196
+score UNICODE_OBFU_ASC               2.497
+score URI_DOTEDU                     1.997
+score URI_FIREBASEAPP                2.996
+score URI_GOOGLE_PROXY               2.297
+score URI_IN_URI_10                  2.497
+score URI_PHISH                      3.995
+score URI_PHP_REDIR                  3.496
+score URI_TRY_3LD                    1.998
+score URI_WPADMIN                    2.397
+score URI_WP_DIRINDEX                3.496
+score URI_WP_HACKED_2                2.498
 score WORD_INVIS                     0.001
-score WORD_INVIS_MANY                2.999
-score XM_RANDOM                      2.499
-score XM_RECPTID                     2.999
-score XPRIO_SHORT_SUBJ               2.500
-score YOUR_DELIVERY_ADDRESS          1.250
-score YOU_INHERIT                    2.553
+score WORD_INVIS_MANY                2.996
+score XM_RANDOM                      2.497
+score XM_RECPTID                     2.996
+score YOUR_DELIVERY_ADDRESS          1.248
+score YOU_INHERIT                    2.497
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -225,6 +231,7 @@
 score BULK_RE_SUSP_NTLD              1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
+score COMPENSATION                   1.000
 score DAY_I_EARNED                   1.000
 score DOTGOV_IMAGE                   1.000
 score DYNAMIC_IMGUR                  1.000
@@ -239,6 +246,7 @@
 score FORM_FRAUD                     1.000
 score FREEM_FRNUM_UNICD_EMPTY        1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB     1.000
+score FROM_MISSP_REPLYTO             1.000
 score GAPPY_SALES_LEADS_FREEM        1.000
 score GB_FORGED_MUA_POSTFIX          1.000
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.500
@@ -253,6 +261,7 @@
 score GOOG_STO_IMG_HTML              1.000
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 1.000
+score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
@@ -286,6 +295,7 @@
 score MSGID_HDR_MALF                 1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
+score PDS_FROM_2_EMAILS              1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHISH_FBASEAPP                 1.000
 score PHP_NOVER_MUA                  1.000
@@ -313,7 +323,6 @@
 score REPTO_INFONUMSCOM              1.000
 score SENDGRID_REDIR_PHISH           1.000
 score SEO_SUSP_NTLD                  1.000
-score SHORTENER_SHORT_IMG            1.000
 score SHORT_IMG_SUSP_NTLD            1.000
 score SPOOFED_FREEMAIL_NO_RDNS       1.000
 score SPOOF_GMAIL_MID                1.000
@@ -327,6 +336,8 @@
 score TO_EQ_FM_DIRECT_MX             1.000
 score TO_IN_SUBJ                     0.100
 score TO_NAME_SUBJ_NO_RDNS           1.000
+score TVD_SPACE_ENCODED              1.000
+score TVD_SPACE_RATIO_MINFP          1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ZW                1.000
@@ -351,6 +362,7 @@
 score WANT_TO_ORDER                  1.000
 score XM_DIGITS_ONLY                 1.000
 score XPRIO                          1.000
+score XPRIO_SHORT_SUBJ               1.000
 # in active.list but have no hits in recent corpus
 score ARC_SIGNED                     0.001 # force non-zero
 score ARC_VALID                      0.001 # force non-zero
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index 3543be9..6854271 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -3,83 +3,83 @@
 
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_FROM_MANY_DOTS              3.000
+score AC_FROM_MANY_DOTS              2.999
 score AC_HTML_NONSENSE_TAGS          1.999
 score ADMITS_SPAM                    2.999
-score ADVANCE_FEE_2_NEW_FRM_MNY      0.343
+score ADVANCE_FEE_2_NEW_FRM_MNY      0.990
 score ADVANCE_FEE_2_NEW_MONEY        0.001
 score ADVANCE_FEE_3_NEW              3.499
 score ADVANCE_FEE_3_NEW_FRM_MNY      2.199
-score ADVANCE_FEE_3_NEW_MONEY        2.387
+score ADVANCE_FEE_3_NEW_MONEY        2.263
 score ADVANCE_FEE_4_NEW              2.199
-score ADVANCE_FEE_4_NEW_FRM_MNY      2.400
-score ADVANCE_FEE_4_NEW_MONEY        1.894
-score ADVANCE_FEE_5_NEW              2.299
-score ADVANCE_FEE_5_NEW_FRM_MNY      0.001 # force non-zero
-score ADVANCE_FEE_5_NEW_MONEY        0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.399
+score ADVANCE_FEE_4_NEW_MONEY        1.702
+score ADVANCE_FEE_5_NEW              2.300
+score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
+score ADVANCE_FEE_5_NEW_MONEY        0.001
 score AD_PREFS                       0.001 # force non-zero
 score ALIBABA_IMG_NOT_RCVD_ALI       2.499
-score AMAZON_IMG_NOT_RCVD_AMZN       1.099
+score AMAZON_IMG_NOT_RCVD_AMZN       1.096
 score APOSTROPHE_TOCC                0.999
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   2.299
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.001 # force non-zero
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   2.065
 score BIGNUM_EMAILS_FREEM            2.999
-score BIGNUM_EMAILS_MANY             2.823
-score BITCOIN_EXTORT_01              0.583
-score BITCOIN_MALF_HTML              2.543
+score BIGNUM_EMAILS_MANY             2.999
+score BITCOIN_EXTORT_01              0.648
+score BITCOIN_MALF_HTML              3.289
 score BITCOIN_ONAN                   2.999
 score BITCOIN_SPAM_02                0.001
 score BITCOIN_SPAM_03                2.499
-score BITCOIN_SPAM_05                0.685
-score BITCOIN_XPRIO                  0.001 # force non-zero
-score BODY_EMAIL_419_FRAUD_GM        2.499
+score BITCOIN_SPAM_05                0.434
+score BITCOIN_XPRIO                  0.001
+score BODY_EMAIL_419_FRAUD_GM        1.878
 score BODY_SINGLE_URI                0.001
 score BODY_SINGLE_WORD               0.001
-score BODY_URI_ONLY                  2.476
+score BODY_URI_ONLY                  2.313
 score BOGUS_MIME_VERSION             3.499
-score BOGUS_MSM_HDRS                 2.287
+score BOGUS_MSM_HDRS                 2.777
 score CK_HELO_GENERIC                0.001
-score COMPENSATION                   1.499
-score CONTENT_AFTER_HTML             2.124
+score COMPENSATION                   1.343
+score CONTENT_AFTER_HTML             1.615
 score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              0.837
+score CTE_8BIT_MISMATCH              0.838
 score DEAR_BENEFICIARY               2.899
 score DKIMWL_WL_HIGH                 -0.573
 score DKIMWL_WL_MED                  -0.001
-score DKIMWL_WL_MEDHI                -0.001
+score DKIMWL_WL_MEDHI                -0.107
 score DX_TEXT_03                     1.299
 score ENCRYPTED_MESSAGE              -0.999
 score END_FUTURE_EMAILS              2.499
-score FILL_THIS_FORM                 1.464
+score FILL_THIS_FORM                 1.465
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_HTML_NOHTML         2.999
 score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               0.045
-score FONT_INVIS_POSTEXTRAS          1.783
-score FORGED_SPF_HELO                0.107
+score FONT_INVIS_MSGID               0.001
+score FONT_INVIS_POSTEXTRAS          2.086
+score FORGED_SPF_HELO                0.114
 score FORM_FRAUD                     0.999
-score FORM_FRAUD_3                   0.200
+score FORM_FRAUD_3                   2.378
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      2.356
+score FOUND_YOU                      2.338
 score FREEMAIL_FORGED_FROMDOMAIN     0.250
-score FROM_2_EMAILS_SHORT            1.581
+score FROM_2_EMAILS_SHORT            2.012
 score FROM_ADDR_WS                   2.999
 score FROM_BANK_NOAUTH               0.999
 score FROM_FMBLA_NEWDOM              0.303
 score FROM_FMBLA_NEWDOM14            0.999
 score FROM_FMBLA_NEWDOM28            0.799
-score FROM_GOV_DKIM_AU               -0.811
+score FROM_GOV_DKIM_AU               -0.495
 score FROM_MISSPACED                 1.999
-score FROM_MISSP_DYNIP               2.199
+score FROM_MISSP_DYNIP               1.732
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            0.001 # force non-zero
+score FROM_MISSP_FREEMAIL            0.001
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_SPF_FAIL            0.001
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              1.001
-score FROM_NTLD_LINKBAIT             0.895
-score FROM_NTLD_REPLY_FREEMAIL       0.253
-score FROM_PAYPAL_SPOOF              1.456
+score FROM_MULTI_NORDNS              0.999
+score FROM_NTLD_LINKBAIT             0.001
+score FROM_NTLD_REPLY_FREEMAIL       1.999
+score FROM_PAYPAL_SPOOF              0.417
 score FROM_SUSPICIOUS_NTLD           0.001 # force non-zero
 score FROM_SUSPICIOUS_NTLD_FP        1.999
 score FSL_BULK_SIG                   0.001
@@ -87,13 +87,13 @@
 score FSL_HELO_FAKE                  3.099
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.299
-score GB_FAKE_RF_SHORT               1.999
+score GB_FAKE_RF_SHORT               1.468
 score GB_FREEMAIL_DISPTO             0.001
-score GB_HASHBL_BTC                  2.584
-score GB_URI_FLEEK_STO_HTM           0.999
-score GB_WEBFORM                     1.500
-score GOOG_REDIR_HTML_ONLY           2.000
-score GOOG_REDIR_NORDNS              3.299
+score GB_HASHBL_BTC                  2.500
+score GB_URI_FLEEK_STO_HTM           1.000
+score GB_WEBFORM                     1.499
+score GOOG_REDIR_HTML_ONLY           1.999
+score GOOG_REDIR_NORDNS              3.300
 score GOOG_STO_EMAIL_PHISH           2.999
 score GOOG_STO_NOIMG_HTML            2.999
 score HAS_X_OUTGOING_SPAM_STAT       0.001
@@ -101,132 +101,132 @@
 score HDRS_MISSP                     2.499
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
-score HELO_NO_DOMAIN                 0.001
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score HELO_NO_DOMAIN                 0.001 # force non-zero
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.999
 score HK_RANDOM_FROM                 0.999
-score HK_RANDOM_REPLYTO              0.912
+score HK_RANDOM_REPLYTO              0.909
 score HK_SCAM                        0.001
-score HK_WIN                         0.254
-score HOSTED_IMG_DIRECT_MX           2.399
-score HOSTED_IMG_FREEM               2.426
-score HOSTED_IMG_MULTI_PUB_01        2.999
+score HK_WIN                         0.285
+score HOSTED_IMG_DIRECT_MX           2.687
+score HOSTED_IMG_FREEM               2.425
+score HOSTED_IMG_MULTI_PUB_01        3.000
 score HTML_ENTITY_ASCII              2.999
-score HTML_OFF_PAGE                  2.999
-score HTML_SINGLET_MANY              1.647
+score HTML_OFF_PAGE                  3.000
+score HTML_SINGLET_MANY              1.909
 score HTML_TEXT_INVISIBLE_FONT       1.999
-score HTML_TEXT_INVISIBLE_STYLE      2.453
+score HTML_TEXT_INVISIBLE_STYLE      2.455
 score IMG_ONLY_FM_DOM_INFO           2.499
-score JH_SPAMMY_HEADERS              3.500
-score KHOP_HELO_FCRDNS               0.400
-score LIST_PARTIAL_SHORT_MSG         2.163
-score LONG_HEX_URI                   1.517
-score LONG_IMG_URI                   1.876
-score LONG_INVISIBLE_TEXT            1.821
+score JH_SPAMMY_HEADERS              3.499
+score KHOP_HELO_FCRDNS               0.399
+score LIST_PARTIAL_SHORT_MSG         2.154
+score LONG_HEX_URI                   1.531
+score LONG_IMG_URI                   1.912
+score LONG_INVISIBLE_TEXT            2.355
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    1.499
-score LOTTO_DEPT                     0.001
-score MILLION_HUNDRED                0.001
+score LOTTO_DEPT                     0.001 # force non-zero
+score MILLION_HUNDRED                0.299
 score MILLION_USD                    1.999
 score MIMEOLE_DIRECT_TO_MX           0.001
-score MIXED_ES                       0.771
-score MONEY_ATM_CARD                 0.428
+score MIXED_ES                       0.767
+score MONEY_ATM_CARD                 1.936
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               0.497
+score MONEY_FORM_SHORT               0.508
 score MONEY_FRAUD_3                  2.799
 score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  2.781
-score MONEY_FREEMAIL_REPTO           1.813
+score MONEY_FRAUD_8                  2.147
+score MONEY_FREEMAIL_REPTO           1.704
 score MONEY_FROM_41                  1.999
-score MONEY_FROM_MISSP               0.424
+score MONEY_FROM_MISSP               0.282
 score MSGID_NOFQDN1                  0.001
 score MSMAIL_PRI_ABNORMAL            0.001
-score MSM_PRIO_REPTO                 2.500
+score MSM_PRIO_REPTO                 2.499
 score NAME_EMAIL_DIFF                0.001
 score NA_DOLLARS                     0.001
-score NEW_PRODUCTS                   0.987
+score NEW_PRODUCTS                   0.805
 score NICE_REPLY_A                   -0.001
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             2.005
-score NUMBERONLY_BITCOIN_EXP         0.342
-score OBFU_TEXT_ATTACH               0.369
+score NSL_RCVD_HELO_USER             1.661
+score NUMBERONLY_BITCOIN_EXP         1.804
+score OBFU_TEXT_ATTACH               0.924
 score ODD_FREEM_REPTO                2.943
-score PDS_BTC_ID                     0.500
+score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.001
-score PDS_DBL_URL_TNB_RUNON          1.999
+score PDS_DBL_URL_TNB_RUNON          2.000
 score PDS_HELO_SPF_FAIL              1.999
 score PDS_NAKED_TO_NUMERO            1.999
 score PDS_NO_FULL_NAME_SPOOFED_URL   0.749
 score PDS_OTHER_BAD_TLD              1.999
-score PDS_SHORT_SPOOFED_URL          2.000
-score PDS_TINYSUBJ_URISHRT           1.089
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.655
+score PDS_SHORT_SPOOFED_URL          1.999
+score PDS_TINYSUBJ_URISHRT           0.987
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.652
 score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.001
-score PHP_ORIG_SCRIPT                2.156
-score PHP_SCRIPT                     2.275
+score PHP_ORIG_SCRIPT                2.162
+score PHP_SCRIPT                     2.273
 score PP_MIME_FAKE_ASCII_TEXT        0.999
 score RAND_HEADER_MANY               2.999
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                0.444
+score RATWARE_NO_RDNS                1.659
 score RCVD_IN_MSPIKE_H2              -0.001
-score RDNS_NUM_TLD_XM                0.991
-score REPLYTO_EMPTY                  2.099
+score RDNS_NUM_TLD_XM                2.271
+score REPLYTO_EMPTY                  2.100
 score REPTO_419_FRAUD_GM             2.999
 score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      1.630
+score RISK_FREE                      0.928
 score SCC_BODY_SINGLE_WORD           0.001
-score SCC_BODY_URI_ONLY              1.145
+score SCC_BODY_URI_ONLY              1.274
 score SCC_CANSPAM_2                  2.799
-score SCC_ISEMM_LID_1                1.780
-score SCC_SPAMMER_ADDR_2             2.299
+score SCC_ISEMM_LID_1                2.587
+score SCC_SPAMMER_ADDR_2             2.199
 score SCC_THREE_WORD_MONTY           2.899
 score SENDGRID_REDIR                 1.499
-score SERGIO_SUBJECT_VIAGRA01        3.599
+score SERGIO_SUBJECT_VIAGRA01        4.120
 score SHOPIFY_IMG_NOT_RCVD_SFY       0.001
 score SHORTENED_URL_SRC              2.199
-score SHORTENER_SHORT_IMG            0.291
+score SHORTENER_SHORT_IMG            0.160
 score SHORT_SHORTNER                 1.999
 score SPOOFED_FREEMAIL               1.999
 score SPOOFED_FREEMAIL_NO_RDNS       0.001 # force non-zero
-score SPOOFED_FREEM_REPTO            2.122
-score SPOOFED_FREEM_REPTO_CHN        3.499
+score SPOOFED_FREEM_REPTO            2.082
+score SPOOFED_FREEM_REPTO_CHN        3.369
 score SPOOF_GMAIL_MID                0.001
 score STATIC_XPRIO_OLE               0.001
 score THIS_AD                        1.099
-score TONOM_EQ_TOLOC_SHRT_SHRTNER    0.028
+score TONOM_EQ_TOLOC_SHRT_SHRTNER    0.001
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_NO_BRKTS_FROM_MSSP          2.499
+score TO_NO_BRKTS_FROM_MSSP          2.500
 score TO_NO_BRKTS_HTML_IMG           1.999
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_NORDNS_HTML        1.205
+score TO_NO_BRKTS_NORDNS_HTML        1.204
 score TO_NO_BRKTS_PCNT               2.499
-score TVD_RCVD_SPACE_BRACKET         2.791
+score TVD_RCVD_SPACE_BRACKET         2.133
 score TVD_SUBJ_NUM_OBFU_MINFP        2.199
 score UNDISC_FREEM                   3.099
-score UNDISC_MONEY                   2.923
+score UNDISC_MONEY                   2.983
 score UNICODE_OBFU_ASC               2.499
-score URI_DOTEDU                     2.000
+score URI_DOTEDU                     1.999
 score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               2.299
+score URI_GOOGLE_PROXY               2.300
 score URI_IN_URI_10                  2.499
-score URI_ONLY_MSGID_MALF            1.375
-score URI_PHISH                      2.376
-score URI_PHP_REDIR                  3.298
+score URI_ONLY_MSGID_MALF            1.405
+score URI_PHISH                      2.380
+score URI_PHP_REDIR                  3.296
 score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.299
-score URI_WP_DIRINDEX                3.489
+score URI_WP_DIRINDEX                3.496
 score URI_WP_HACKED                  3.499
 score URI_WP_HACKED_2                1.596
 score WORD_INVIS_MANY                2.999
 score XM_RANDOM                      2.499
-score XM_RECPTID                     2.999
+score XM_RECPTID                     3.000
 score XPRIO                          0.001
-score XPRIO_SHORT_SUBJ               2.340
-score YOUR_DELIVERY_ADDRESS          1.250
-score YOU_INHERIT                    2.499
+score XPRIO_SHORT_SUBJ               0.036
+score YOUR_DELIVERY_ADDRESS          1.249
+score YOU_INHERIT                    2.500
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -315,7 +315,6 @@
 score MALF_HTML_B64                  1.000
 score MALWARE_NORDNS                 1.000
 score MALWARE_PASSWORD               1.000
-score MANY_HDRS_LCASE                0.100
 score MIME_NO_TEXT                   1.000
 score MIXED_AREA_CASE                1.000
 score MIXED_CENTER_CASE              1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index 422d4bf..be42d85 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,191 +1,197 @@
-# Using score set 0 logs for revision 1903234 from:
-# ham-ena-week0.r1903234.log ham-ena-week1.r1903234.log ham-ena-week2.r1903234.log ham-ena-week3.r1903234.log ham-ena-week4.r1903234.log ham-giovanni-ham.r1903234.log ham-giovanni-spammy.r1903234.log ham-giovanni-spam.r1903234.log ham-grenier.r1903234.log ham-hege.r1903234.log ham-jhardin.r1903234.log ham-llanga.r1903234.log ham-mmiroslaw-mails-ham.r1903234.log ham-mmiroslaw-mails-spam.r1903234.log ham-spamsponge.r1903234.log ham-thendrikx.r1903234.log ham-tsz-spam-corpus.r1903234.log spam-ena-week0.r1903234.log spam-ena-week1.r1903234.log spam-ena-week2.r1903234.log spam-ena-week3.r1903234.log spam-ena-week4.r1903234.log spam-giovanni-ham.r1903234.log spam-giovanni-spammy.r1903234.log spam-giovanni-spam.r1903234.log spam-grenier.r1903234.log spam-hege.r1903234.log spam-jhardin.r1903234.log spam-llanga.r1903234.log spam-mmiroslaw-mails-ham.r1903234.log spam-mmiroslaw-mails-spam.r1903234.log spam-spamsponge.r1903234.log spam-thendrikx.r1903234.log spam-tsz-spam-corpus.r1903234.log
+# Using score set 0 logs for revision 1903264 from:
+# ham-ena-week0.r1903264.log ham-ena-week1.r1903264.log ham-ena-week2.r1903264.log ham-ena-week3.r1903264.log ham-ena-week4.r1903264.log ham-giovanni-ham.r1903264.log ham-giovanni-spammy.r1903264.log ham-giovanni-spam.r1903264.log ham-grenier.r1903264.log ham-hege.r1903264.log ham-jhardin.r1903264.log ham-llanga.r1903264.log ham-mmiroslaw-mails-ham.r1903264.log ham-mmiroslaw-mails-spam.r1903264.log ham-thendrikx.r1903264.log ham-tsz-spam-corpus.r1903264.log spam-ena-week0.r1903264.log spam-ena-week1.r1903264.log spam-ena-week2.r1903264.log spam-ena-week3.r1903264.log spam-ena-week4.r1903264.log spam-giovanni-ham.r1903264.log spam-giovanni-spammy.r1903264.log spam-giovanni-spam.r1903264.log spam-grenier.r1903264.log spam-hege.r1903264.log spam-jhardin.r1903264.log spam-llanga.r1903264.log spam-mmiroslaw-mails-ham.r1903264.log spam-mmiroslaw-mails-spam.r1903264.log spam-thendrikx.r1903264.log spam-tsz-spam-corpus.r1903264.log
 
 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                    3.099
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.860
-score ADVANCE_FEE_2_NEW_MONEY        0.878
-score ADVANCE_FEE_3_NEW              3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY      2.299
-score ADVANCE_FEE_3_NEW_MONEY        2.799
-score ADVANCE_FEE_4_NEW              2.199
-score ADVANCE_FEE_4_NEW_FRM_MNY      2.500
-score ADVANCE_FEE_4_NEW_MONEY        0.990
-score ADVANCE_FEE_5_NEW              2.400
+score AC_FROM_MANY_DOTS              2.996
+score AC_HTML_NONSENSE_TAGS          1.997
+score ADMITS_SPAM                    3.196
+score ADVANCE_FEE_2_NEW_FRM_MNY      0.532
+score ADVANCE_FEE_2_NEW_MONEY        1.997
+score ADVANCE_FEE_3_NEW              3.496
+score ADVANCE_FEE_3_NEW_FRM_MNY      2.297
+score ADVANCE_FEE_3_NEW_MONEY        2.796
+score ADVANCE_FEE_4_NEW              2.197
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.397
+score ADVANCE_FEE_4_NEW_MONEY        1.489
+score ADVANCE_FEE_5_NEW              2.398
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_5_NEW_MONEY        0.001
-score AD_PREFS                       0.001
-score ALIBABA_IMG_NOT_RCVD_ALI       2.499
-score AMAZON_IMG_NOT_RCVD_AMZN       2.499
-score APOSTROPHE_TOCC                0.999
+score AD_PREFS                       0.230
+score ALIBABA_IMG_NOT_RCVD_ALI       2.497
+score AMAZON_IMG_NOT_RCVD_AMZN       2.497
+score APOSTROPHE_TOCC                0.998
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score BIGNUM_EMAILS_FREEM            2.999
-score BIGNUM_EMAILS_MANY             3.000
-score BITCOIN_EXTORT_01              4.250
-score BITCOIN_MALF_HTML              3.499
-score BITCOIN_ONAN                   2.999
-score BITCOIN_SPAM_02                2.499
-score BITCOIN_SPAM_03                2.499
-score BITCOIN_XPRIO                  2.499
-score BODY_EMAIL_419_FRAUD_GM        2.500
-score BODY_SINGLE_URI                0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.422
+score BIGNUM_EMAILS_FREEM            2.997
+score BIGNUM_EMAILS_MANY             2.996
+score BITCOIN_EXTORT_01              4.146
+score BITCOIN_MALF_HTML              3.496
+score BITCOIN_ONAN                   2.996
+score BITCOIN_SPAM_02                2.497
+score BITCOIN_SPAM_03                2.497
+score BITCOIN_XPRIO                  2.497
+score BODY_EMAIL_419_FRAUD_GM        2.497
+score BODY_SINGLE_URI                0.002
 score BODY_SINGLE_WORD               0.001
-score BOGUS_MIME_VERSION             3.499
-score BOGUS_MSM_HDRS                 0.682
-score CK_HELO_GENERIC                0.250
-score CONTENT_AFTER_HTML             2.499
-score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              1.000
-score DEAR_BENEFICIARY               3.054
-score DX_TEXT_03                     1.199
+score BOGUS_MIME_VERSION             3.496
+score BOGUS_MSM_HDRS                 1.915
+score CK_HELO_GENERIC                0.248
+score CONTENT_AFTER_HTML             2.497
+score CONTENT_AFTER_HTML_WEAK        1.498
+score CTE_8BIT_MISMATCH              0.998
+score DEAR_BENEFICIARY               2.358
+score DX_TEXT_03                     1.098
 score ENCRYPTED_MESSAGE              -0.999
-score FILL_THIS_FORM                 1.699
-score FONT_INVIS_DIRECT              1.607
-score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               1.236
-score FONT_INVIS_POSTEXTRAS          1.602
-score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      2.067
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROM_2_EMAILS_SHORT            2.052
-score FROM_ADDR_WS                   2.999
-score FROM_MISSPACED                 1.999
-score FROM_MISSP_DYNIP               1.802
-score FROM_MISSP_EH_MATCH            1.999
-score FROM_MISSP_FREEMAIL            3.199
+score FILL_THIS_FORM                 1.695
+score FONT_INVIS_DIRECT              1.681
+score FONT_INVIS_HTML_NOHTML         2.996
+score FONT_INVIS_LONG_LINE           2.996
+score FONT_INVIS_MSGID               1.644
+score FONT_INVIS_POSTEXTRAS          1.592
+score FORM_FRAUD_5                   0.001 # force non-zero
+score FOUND_YOU                      2.505
+score FREEMAIL_FORGED_FROMDOMAIN     0.248
+score FROM_2_EMAILS_SHORT            2.044
+score FROM_ADDR_WS                   2.996
+score FROM_MISSPACED                 1.997
+score FROM_MISSP_DYNIP               2.012
+score FROM_MISSP_EH_MATCH            1.997
+score FROM_MISSP_FREEMAIL            3.196
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              2.425
-score FROM_NTLD_LINKBAIT             0.497
-score FROM_NTLD_REPLY_FREEMAIL       1.364
-score FROM_SUSPICIOUS_NTLD           0.500
-score FROM_SUSPICIOUS_NTLD_FP        2.000
-score FSL_CTYPE_WIN1251              0.001 # force non-zero
-score FSL_HELO_FAKE                  3.099
-score FSL_NEW_HELO_USER              0.501
-score FUZZY_AMAZON                   2.400
-score GB_FAKE_RF_SHORT               1.999
-score GB_FREEMAIL_DISPTO             0.499
-score GB_URI_FLEEK_STO_HTM           0.999
-score GB_WEBFORM                     1.499
-score GOOG_REDIR_HTML_ONLY           1.999
-score GOOG_REDIR_NORDNS              2.500
-score GOOG_STO_EMAIL_PHISH           2.999
-score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       1.999
-score HDRS_MISSP                     2.499
-score HDR_ORDER_FTSDMCXX_DIRECT      1.999
-score HDR_ORDER_FTSDMCXX_NORDNS      0.499
-score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score FROM_MULTI_NORDNS              0.518
+score FROM_NTLD_LINKBAIT             0.001
+score FROM_NTLD_REPLY_FREEMAIL       1.288
+score FROM_SUSPICIOUS_NTLD           0.498
+score FROM_SUSPICIOUS_NTLD_FP        1.997
+score FSL_CTYPE_WIN1251              0.001
+score FSL_HELO_FAKE                  3.196
+score FSL_NEW_HELO_USER              0.832
+score FUZZY_AMAZON                   2.397
+score GB_FAKE_RF_SHORT               1.972
+score GB_FREEMAIL_DISPTO             0.498
+score GB_URI_FLEEK_STO_HTM           0.998
+score GB_WEBFORM                     1.498
+score GOOG_REDIR_HTML_ONLY           1.997
+score GOOG_REDIR_NORDNS              2.593
+score GOOG_STO_EMAIL_PHISH           2.656
+score GOOG_STO_NOIMG_HTML            2.997
+score HAS_X_OUTGOING_SPAM_STAT       1.506
+score HDRS_MISSP                     2.497
+score HDR_ORDER_FTSDMCXX_DIRECT      0.784
+score HDR_ORDER_FTSDMCXX_NORDNS      0.001
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
-score HK_NAME_MR_MRS                 0.999
-score HK_RANDOM_ENVFROM              0.999
+score HK_NAME_MR_MRS                 0.998
+score HK_RANDOM_ENVFROM              0.998
 score HK_RANDOM_FROM                 0.999
-score HK_RANDOM_REPLYTO              1.000
-score HK_SCAM                        0.798
-score HK_WIN                         0.939
-score HOSTED_IMG_DIRECT_MX           3.499
-score HOSTED_IMG_FREEM               3.499
-score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_ENTITY_ASCII              2.999
-score HTML_OFF_PAGE                  2.999
-score HTML_TEXT_INVISIBLE_STYLE      1.930
-score IMG_ONLY_FM_DOM_INFO           2.188
-score JH_SPAMMY_HEADERS              3.499
-score LIST_PARTIAL_SHORT_MSG         2.499
-score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   1.888
-score LONG_INVISIBLE_TEXT            2.292
+score HK_RANDOM_REPLYTO              0.998
+score HK_SCAM                        1.251
+score HK_WIN                         0.731
+score HOSTED_IMG_DIRECT_MX           3.496
+score HOSTED_IMG_FREEM               3.496
+score HOSTED_IMG_MULTI_PUB_01        2.996
+score HTML_ENTITY_ASCII              2.996
+score HTML_OFF_PAGE                  2.996
+score HTML_TEXT_INVISIBLE_STYLE      1.885
+score IMG_ONLY_FM_DOM_INFO           2.187
+score JH_SPAMMY_HEADERS              3.496
+score LIST_PARTIAL_SHORT_MSG         2.497
+score LONG_HEX_URI                   2.997
+score LONG_IMG_URI                   1.935
+score LONG_INVISIBLE_TEXT            2.312
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.499
+score LOTTO_AGENT                    1.498
 score LOTTO_DEPT                     0.001
-score MILLION_HUNDRED                0.001
-score MILLION_USD                    1.434
-score MIMEOLE_DIRECT_TO_MX           1.628
-score MIXED_ES                       2.699
-score MONEY_ATM_CARD                 0.001 # force non-zero
-score MONEY_FORM                     0.086
-score MONEY_FORM_SHORT               1.642
-score MONEY_FRAUD_3                  2.899
+score MALW_ATTACH                    2.098
+score MILLION_HUNDRED                0.130
+score MILLION_USD                    1.997
+score MIMEOLE_DIRECT_TO_MX           0.779
+score MIXED_ES                       2.497
+score MONEY_ATM_CARD                 0.360
+score MONEY_FORM                     0.001 # force non-zero
+score MONEY_FORM_SHORT               2.497
+score MONEY_FRAUD_3                  2.897
 score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  2.268
-score MONEY_FREEMAIL_REPTO           3.000
-score MONEY_FROM_41                  1.999
-score MONEY_FROM_MISSP               2.000
-score MSGID_NOFQDN1                  1.150
+score MONEY_FRAUD_8                  1.707
+score MONEY_FREEMAIL_REPTO           2.996
+score MONEY_FROM_41                  1.997
+score MONEY_FROM_MISSP               1.997
+score MSGID_NOFQDN1                  1.149
 score MSMAIL_PRI_ABNORMAL            0.001
-score MSM_PRIO_REPTO                 2.499
-score NA_DOLLARS                     1.499
-score NEW_PRODUCTS                   0.800
+score MSM_PRIO_REPTO                 2.497
+score NAME_EMAIL_DIFF                1.728
+score NA_DOLLARS                     1.498
+score NEW_PRODUCTS                   1.248
 score NICE_REPLY_A                   -0.001
 score NO_FM_NAME_IP_HOSTN            0.001
-score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             1.115
-score OBFU_TEXT_ATTACH               0.300
-score ODD_FREEM_REPTO                2.999
-score PDS_BTC_ID                     0.499
-score PDS_BTC_MSGID                  0.001
-score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_NO_FULL_NAME_SPOOFED_URL   0.749
-score PDS_OTHER_BAD_TLD              1.999
-score PDS_SHORT_SPOOFED_URL          1.999
-score PDS_TINYSUBJ_URISHRT           0.200
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.999
-score PHP_ORIG_SCRIPT                2.499
-score PHP_SCRIPT                     2.499
-score PP_MIME_FAKE_ASCII_TEXT        0.999
-score RAND_HEADER_MANY               2.999
-score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                1.621
-score RDNS_NUM_TLD_XM                1.468
-score REPTO_419_FRAUD_GM             2.999
-score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      0.760
+score NSL_RCVD_FROM_USER             0.178
+score NSL_RCVD_HELO_USER             1.162
+score NUMBERONLY_BITCOIN_EXP         1.813
+score OBFU_TEXT_ATTACH               0.885
+score ODD_FREEM_REPTO                2.996
+score PDS_BTC_ID                     0.498
+score PDS_BTC_MSGID                  0.437
+score PDS_DBL_URL_TNB_RUNON          1.998
+score PDS_NAKED_TO_NUMERO            1.463
+score PDS_NO_FULL_NAME_SPOOFED_URL   0.748
+score PDS_OTHER_BAD_TLD              1.998
+score PDS_SHORT_SPOOFED_URL          1.997
+score PDS_TINYSUBJ_URISHRT           0.246
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
+score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.998
+score PHP_ORIG_SCRIPT                2.497
+score PHP_SCRIPT                     2.498
+score PP_MIME_FAKE_ASCII_TEXT        0.998
+score RAND_HEADER_MANY               2.996
+score RAND_MKTG_HEADER               1.998
+score RATWARE_NO_RDNS                1.706
+score RDNS_NUM_TLD_XM                0.346
+score REPLYTO_EMPTY                  2.197
+score REPTO_419_FRAUD_GM             2.996
+score REPTO_419_FRAUD_GM_LOOSE       0.998
+score RISK_FREE                      0.599
 score SCC_BODY_SINGLE_WORD           0.001
-score SCC_BODY_URI_ONLY              2.699
-score SCC_CANSPAM_2                  3.000
-score SCC_ISEMM_LID_1                3.040
-score SCC_SPAMMER_ADDR_2             2.399
-score SCC_THREE_WORD_MONTY           3.000
-score SENDGRID_REDIR                 1.499
-score SERGIO_SUBJECT_VIAGRA01        4.166
-score SHOPIFY_IMG_NOT_RCVD_SFY       0.750
-score SHORTENED_URL_SRC              2.299
-score SHORT_SHORTNER                 1.999
-score STATIC_XPRIO_OLE               0.001
-score THIS_AD                        1.099
-score TONOM_EQ_TOLOC_SHRT_SHRTNER    0.001 # force non-zero
-score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.999
-score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_NORDNS_HTML        1.999
-score TO_NO_BRKTS_PCNT               2.499
-score TVD_RCVD_SPACE_BRACKET         1.617
-score UNDISC_FREEM                   3.299
-score UNDISC_MONEY                   3.199
-score UNICODE_OBFU_ASC               2.499
-score URI_DOTEDU                     1.999
-score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               2.499
-score URI_IN_URI_10                  2.699
-score URI_PHISH                      3.999
-score URI_PHP_REDIR                  3.499
-score URI_TRY_3LD                    1.949
-score URI_WPADMIN                    2.400
-score URI_WP_DIRINDEX                3.499
-score URI_WP_HACKED_2                2.499
+score SCC_BODY_URI_ONLY              2.696
+score SCC_CANSPAM_2                  2.896
+score SCC_ISEMM_LID_1                2.280
+score SCC_SPAMMER_ADDR_2             2.297
+score SCC_THREE_WORD_MONTY           2.996
+score SENDGRID_REDIR                 1.498
+score SERGIO_SUBJECT_VIAGRA01        3.559
+score SHOPIFY_IMG_NOT_RCVD_SFY       0.996
+score SHORTENED_URL_SRC              2.198
+score SHORTENER_SHORT_IMG            0.001
+score SHORT_SHORTNER                 1.997
+score STATIC_XPRIO_OLE               0.008
+score THIS_AD                        1.199
+score TONOM_EQ_TOLOC_SHRT_SHRTNER    0.001
+score TO_NO_BRKTS_FROM_MSSP          2.497
+score TO_NO_BRKTS_HTML_IMG           1.997
+score TO_NO_BRKTS_HTML_ONLY          1.997
+score TO_NO_BRKTS_NORDNS_HTML        1.787
+score TO_NO_BRKTS_PCNT               2.497
+score TVD_RCVD_SPACE_BRACKET         0.636
+score UNDISC_FREEM                   3.297
+score UNDISC_MONEY                   3.196
+score UNICODE_OBFU_ASC               2.497
+score URI_DOTEDU                     1.997
+score URI_FIREBASEAPP                2.996
+score URI_GOOGLE_PROXY               2.297
+score URI_IN_URI_10                  2.497
+score URI_PHISH                      3.995
+score URI_PHP_REDIR                  3.496
+score URI_TRY_3LD                    1.998
+score URI_WPADMIN                    2.397
+score URI_WP_DIRINDEX                3.496
+score URI_WP_HACKED_2                2.498
 score WORD_INVIS                     0.001
-score WORD_INVIS_MANY                2.999
-score XM_RANDOM                      2.499
-score XM_RECPTID                     2.999
-score XPRIO_SHORT_SUBJ               2.500
-score YOUR_DELIVERY_ADDRESS          1.250
-score YOU_INHERIT                    2.553
+score WORD_INVIS_MANY                2.996
+score XM_RANDOM                      2.497
+score XM_RECPTID                     2.996
+score YOUR_DELIVERY_ADDRESS          1.248
+score YOU_INHERIT                    2.497
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -225,6 +231,7 @@
 score BULK_RE_SUSP_NTLD              1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
+score COMPENSATION                   1.000
 score DAY_I_EARNED                   1.000
 score DOTGOV_IMAGE                   1.000
 score DYNAMIC_IMGUR                  1.000
@@ -239,6 +246,7 @@
 score FORM_FRAUD                     1.000
 score FREEM_FRNUM_UNICD_EMPTY        1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB     1.000
+score FROM_MISSP_REPLYTO             1.000
 score GAPPY_SALES_LEADS_FREEM        1.000
 score GB_FORGED_MUA_POSTFIX          1.000
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.500
@@ -253,6 +261,7 @@
 score GOOG_STO_IMG_HTML              1.000
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 1.000
+score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
@@ -286,6 +295,7 @@
 score MSGID_HDR_MALF                 1.000
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score OBFU_BITCOIN                   1.000
+score PDS_FROM_2_EMAILS              1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHISH_FBASEAPP                 1.000
 score PHP_NOVER_MUA                  1.000
@@ -313,7 +323,6 @@
 score REPTO_INFONUMSCOM              1.000
 score SENDGRID_REDIR_PHISH           1.000
 score SEO_SUSP_NTLD                  1.000
-score SHORTENER_SHORT_IMG            1.000
 score SHORT_IMG_SUSP_NTLD            1.000
 score SPOOFED_FREEMAIL_NO_RDNS       1.000
 score SPOOF_GMAIL_MID                1.000
@@ -327,6 +336,8 @@
 score TO_EQ_FM_DIRECT_MX             1.000
 score TO_IN_SUBJ                     0.100
 score TO_NAME_SUBJ_NO_RDNS           1.000
+score TVD_SPACE_ENCODED              1.000
+score TVD_SPACE_RATIO_MINFP          1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ZW                1.000
@@ -351,6 +362,7 @@
 score WANT_TO_ORDER                  1.000
 score XM_DIGITS_ONLY                 1.000
 score XPRIO                          1.000
+score XPRIO_SHORT_SUBJ               1.000
 # in active.list but have no hits in recent corpus
 score ARC_SIGNED                     0.001 # force non-zero
 score ARC_VALID                      0.001 # force non-zero
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index 3543be9..6854271 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -3,83 +3,83 @@
 
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_FROM_MANY_DOTS              3.000
+score AC_FROM_MANY_DOTS              2.999
 score AC_HTML_NONSENSE_TAGS          1.999
 score ADMITS_SPAM                    2.999
-score ADVANCE_FEE_2_NEW_FRM_MNY      0.343
+score ADVANCE_FEE_2_NEW_FRM_MNY      0.990
 score ADVANCE_FEE_2_NEW_MONEY        0.001
 score ADVANCE_FEE_3_NEW              3.499
 score ADVANCE_FEE_3_NEW_FRM_MNY      2.199
-score ADVANCE_FEE_3_NEW_MONEY        2.387
+score ADVANCE_FEE_3_NEW_MONEY        2.263
 score ADVANCE_FEE_4_NEW              2.199
-score ADVANCE_FEE_4_NEW_FRM_MNY      2.400
-score ADVANCE_FEE_4_NEW_MONEY        1.894
-score ADVANCE_FEE_5_NEW              2.299
-score ADVANCE_FEE_5_NEW_FRM_MNY      0.001 # force non-zero
-score ADVANCE_FEE_5_NEW_MONEY        0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.399
+score ADVANCE_FEE_4_NEW_MONEY        1.702
+score ADVANCE_FEE_5_NEW              2.300
+score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
+score ADVANCE_FEE_5_NEW_MONEY        0.001
 score AD_PREFS                       0.001 # force non-zero
 score ALIBABA_IMG_NOT_RCVD_ALI       2.499
-score AMAZON_IMG_NOT_RCVD_AMZN       1.099
+score AMAZON_IMG_NOT_RCVD_AMZN       1.096
 score APOSTROPHE_TOCC                0.999
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   2.299
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.001 # force non-zero
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   2.065
 score BIGNUM_EMAILS_FREEM            2.999
-score BIGNUM_EMAILS_MANY             2.823
-score BITCOIN_EXTORT_01              0.583
-score BITCOIN_MALF_HTML              2.543
+score BIGNUM_EMAILS_MANY             2.999
+score BITCOIN_EXTORT_01              0.648
+score BITCOIN_MALF_HTML              3.289
 score BITCOIN_ONAN                   2.999
 score BITCOIN_SPAM_02                0.001
 score BITCOIN_SPAM_03                2.499
-score BITCOIN_SPAM_05                0.685
-score BITCOIN_XPRIO                  0.001 # force non-zero
-score BODY_EMAIL_419_FRAUD_GM        2.499
+score BITCOIN_SPAM_05                0.434
+score BITCOIN_XPRIO                  0.001
+score BODY_EMAIL_419_FRAUD_GM        1.878
 score BODY_SINGLE_URI                0.001
 score BODY_SINGLE_WORD               0.001
-score BODY_URI_ONLY                  2.476
+score BODY_URI_ONLY                  2.313
 score BOGUS_MIME_VERSION             3.499
-score BOGUS_MSM_HDRS                 2.287
+score BOGUS_MSM_HDRS                 2.777
 score CK_HELO_GENERIC                0.001
-score COMPENSATION                   1.499
-score CONTENT_AFTER_HTML             2.124
+score COMPENSATION                   1.343
+score CONTENT_AFTER_HTML             1.615
 score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              0.837
+score CTE_8BIT_MISMATCH              0.838
 score DEAR_BENEFICIARY               2.899
 score DKIMWL_WL_HIGH                 -0.573
 score DKIMWL_WL_MED                  -0.001
-score DKIMWL_WL_MEDHI                -0.001
+score DKIMWL_WL_MEDHI                -0.107
 score DX_TEXT_03                     1.299
 score ENCRYPTED_MESSAGE              -0.999
 score END_FUTURE_EMAILS              2.499
-score FILL_THIS_FORM                 1.464
+score FILL_THIS_FORM                 1.465
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_HTML_NOHTML         2.999
 score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               0.045
-score FONT_INVIS_POSTEXTRAS          1.783
-score FORGED_SPF_HELO                0.107
+score FONT_INVIS_MSGID               0.001
+score FONT_INVIS_POSTEXTRAS          2.086
+score FORGED_SPF_HELO                0.114
 score FORM_FRAUD                     0.999
-score FORM_FRAUD_3                   0.200
+score FORM_FRAUD_3                   2.378
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      2.356
+score FOUND_YOU                      2.338
 score FREEMAIL_FORGED_FROMDOMAIN     0.250
-score FROM_2_EMAILS_SHORT            1.581
+score FROM_2_EMAILS_SHORT            2.012
 score FROM_ADDR_WS                   2.999
 score FROM_BANK_NOAUTH               0.999
 score FROM_FMBLA_NEWDOM              0.303
 score FROM_FMBLA_NEWDOM14            0.999
 score FROM_FMBLA_NEWDOM28            0.799
-score FROM_GOV_DKIM_AU               -0.811
+score FROM_GOV_DKIM_AU               -0.495
 score FROM_MISSPACED                 1.999
-score FROM_MISSP_DYNIP               2.199
+score FROM_MISSP_DYNIP               1.732
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            0.001 # force non-zero
+score FROM_MISSP_FREEMAIL            0.001
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_SPF_FAIL            0.001
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              1.001
-score FROM_NTLD_LINKBAIT             0.895
-score FROM_NTLD_REPLY_FREEMAIL       0.253
-score FROM_PAYPAL_SPOOF              1.456
+score FROM_MULTI_NORDNS              0.999
+score FROM_NTLD_LINKBAIT             0.001
+score FROM_NTLD_REPLY_FREEMAIL       1.999
+score FROM_PAYPAL_SPOOF              0.417
 score FROM_SUSPICIOUS_NTLD           0.001 # force non-zero
 score FROM_SUSPICIOUS_NTLD_FP        1.999
 score FSL_BULK_SIG                   0.001
@@ -87,13 +87,13 @@
 score FSL_HELO_FAKE                  3.099
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   2.299
-score GB_FAKE_RF_SHORT               1.999
+score GB_FAKE_RF_SHORT               1.468
 score GB_FREEMAIL_DISPTO             0.001
-score GB_HASHBL_BTC                  2.584
-score GB_URI_FLEEK_STO_HTM           0.999
-score GB_WEBFORM                     1.500
-score GOOG_REDIR_HTML_ONLY           2.000
-score GOOG_REDIR_NORDNS              3.299
+score GB_HASHBL_BTC                  2.500
+score GB_URI_FLEEK_STO_HTM           1.000
+score GB_WEBFORM                     1.499
+score GOOG_REDIR_HTML_ONLY           1.999
+score GOOG_REDIR_NORDNS              3.300
 score GOOG_STO_EMAIL_PHISH           2.999
 score GOOG_STO_NOIMG_HTML            2.999
 score HAS_X_OUTGOING_SPAM_STAT       0.001
@@ -101,132 +101,132 @@
 score HDRS_MISSP                     2.499
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.249
-score HELO_NO_DOMAIN                 0.001
+score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score HELO_NO_DOMAIN                 0.001 # force non-zero
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.999
 score HK_RANDOM_FROM                 0.999
-score HK_RANDOM_REPLYTO              0.912
+score HK_RANDOM_REPLYTO              0.909
 score HK_SCAM                        0.001
-score HK_WIN                         0.254
-score HOSTED_IMG_DIRECT_MX           2.399
-score HOSTED_IMG_FREEM               2.426
-score HOSTED_IMG_MULTI_PUB_01        2.999
+score HK_WIN                         0.285
+score HOSTED_IMG_DIRECT_MX           2.687
+score HOSTED_IMG_FREEM               2.425
+score HOSTED_IMG_MULTI_PUB_01        3.000
 score HTML_ENTITY_ASCII              2.999
-score HTML_OFF_PAGE                  2.999
-score HTML_SINGLET_MANY              1.647
+score HTML_OFF_PAGE                  3.000
+score HTML_SINGLET_MANY              1.909
 score HTML_TEXT_INVISIBLE_FONT       1.999
-score HTML_TEXT_INVISIBLE_STYLE      2.453
+score HTML_TEXT_INVISIBLE_STYLE      2.455
 score IMG_ONLY_FM_DOM_INFO           2.499
-score JH_SPAMMY_HEADERS              3.500
-score KHOP_HELO_FCRDNS               0.400
-score LIST_PARTIAL_SHORT_MSG         2.163
-score LONG_HEX_URI                   1.517
-score LONG_IMG_URI                   1.876
-score LONG_INVISIBLE_TEXT            1.821
+score JH_SPAMMY_HEADERS              3.499
+score KHOP_HELO_FCRDNS               0.399
+score LIST_PARTIAL_SHORT_MSG         2.154
+score LONG_HEX_URI                   1.531
+score LONG_IMG_URI                   1.912
+score LONG_INVISIBLE_TEXT            2.355
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    1.499
-score LOTTO_DEPT                     0.001
-score MILLION_HUNDRED                0.001
+score LOTTO_DEPT                     0.001 # force non-zero
+score MILLION_HUNDRED                0.299
 score MILLION_USD                    1.999
 score MIMEOLE_DIRECT_TO_MX           0.001
-score MIXED_ES                       0.771
-score MONEY_ATM_CARD                 0.428
+score MIXED_ES                       0.767
+score MONEY_ATM_CARD                 1.936
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               0.497
+score MONEY_FORM_SHORT               0.508
 score MONEY_FRAUD_3                  2.799
 score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  2.781
-score MONEY_FREEMAIL_REPTO           1.813
+score MONEY_FRAUD_8                  2.147
+score MONEY_FREEMAIL_REPTO           1.704
 score MONEY_FROM_41                  1.999
-score MONEY_FROM_MISSP               0.424
+score MONEY_FROM_MISSP               0.282
 score MSGID_NOFQDN1                  0.001
 score MSMAIL_PRI_ABNORMAL            0.001
-score MSM_PRIO_REPTO                 2.500
+score MSM_PRIO_REPTO                 2.499
 score NAME_EMAIL_DIFF                0.001
 score NA_DOLLARS                     0.001
-score NEW_PRODUCTS                   0.987
+score NEW_PRODUCTS                   0.805
 score NICE_REPLY_A                   -0.001
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             2.005
-score NUMBERONLY_BITCOIN_EXP         0.342
-score OBFU_TEXT_ATTACH               0.369
+score NSL_RCVD_HELO_USER             1.661
+score NUMBERONLY_BITCOIN_EXP         1.804
+score OBFU_TEXT_ATTACH               0.924
 score ODD_FREEM_REPTO                2.943
-score PDS_BTC_ID                     0.500
+score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.001
-score PDS_DBL_URL_TNB_RUNON          1.999
+score PDS_DBL_URL_TNB_RUNON          2.000
 score PDS_HELO_SPF_FAIL              1.999
 score PDS_NAKED_TO_NUMERO            1.999
 score PDS_NO_FULL_NAME_SPOOFED_URL   0.749
 score PDS_OTHER_BAD_TLD              1.999
-score PDS_SHORT_SPOOFED_URL          2.000
-score PDS_TINYSUBJ_URISHRT           1.089
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.655
+score PDS_SHORT_SPOOFED_URL          1.999
+score PDS_TINYSUBJ_URISHRT           0.987
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.652
 score PDS_TONAME_EQ_TOLOCAL_VSHORT   0.001
-score PHP_ORIG_SCRIPT                2.156
-score PHP_SCRIPT                     2.275
+score PHP_ORIG_SCRIPT                2.162
+score PHP_SCRIPT                     2.273
 score PP_MIME_FAKE_ASCII_TEXT        0.999
 score RAND_HEADER_MANY               2.999
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                0.444
+score RATWARE_NO_RDNS                1.659
 score RCVD_IN_MSPIKE_H2              -0.001
-score RDNS_NUM_TLD_XM                0.991
-score REPLYTO_EMPTY                  2.099
+score RDNS_NUM_TLD_XM                2.271
+score REPLYTO_EMPTY                  2.100
 score REPTO_419_FRAUD_GM             2.999
 score REPTO_419_FRAUD_GM_LOOSE       0.999
-score RISK_FREE                      1.630
+score RISK_FREE                      0.928
 score SCC_BODY_SINGLE_WORD           0.001
-score SCC_BODY_URI_ONLY              1.145
+score SCC_BODY_URI_ONLY              1.274
 score SCC_CANSPAM_2                  2.799
-score SCC_ISEMM_LID_1                1.780
-score SCC_SPAMMER_ADDR_2             2.299
+score SCC_ISEMM_LID_1                2.587
+score SCC_SPAMMER_ADDR_2             2.199
 score SCC_THREE_WORD_MONTY           2.899
 score SENDGRID_REDIR                 1.499
-score SERGIO_SUBJECT_VIAGRA01        3.599
+score SERGIO_SUBJECT_VIAGRA01        4.120
 score SHOPIFY_IMG_NOT_RCVD_SFY       0.001
 score SHORTENED_URL_SRC              2.199
-score SHORTENER_SHORT_IMG            0.291
+score SHORTENER_SHORT_IMG            0.160
 score SHORT_SHORTNER                 1.999
 score SPOOFED_FREEMAIL               1.999
 score SPOOFED_FREEMAIL_NO_RDNS       0.001 # force non-zero
-score SPOOFED_FREEM_REPTO            2.122
-score SPOOFED_FREEM_REPTO_CHN        3.499
+score SPOOFED_FREEM_REPTO            2.082
+score SPOOFED_FREEM_REPTO_CHN        3.369
 score SPOOF_GMAIL_MID                0.001
 score STATIC_XPRIO_OLE               0.001
 score THIS_AD                        1.099
-score TONOM_EQ_TOLOC_SHRT_SHRTNER    0.028
+score TONOM_EQ_TOLOC_SHRT_SHRTNER    0.001
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_NO_BRKTS_FROM_MSSP          2.499
+score TO_NO_BRKTS_FROM_MSSP          2.500
 score TO_NO_BRKTS_HTML_IMG           1.999
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_NORDNS_HTML        1.205
+score TO_NO_BRKTS_NORDNS_HTML        1.204
 score TO_NO_BRKTS_PCNT               2.499
-score TVD_RCVD_SPACE_BRACKET         2.791
+score TVD_RCVD_SPACE_BRACKET         2.133
 score TVD_SUBJ_NUM_OBFU_MINFP        2.199
 score UNDISC_FREEM                   3.099
-score UNDISC_MONEY                   2.923
+score UNDISC_MONEY                   2.983
 score UNICODE_OBFU_ASC               2.499
-score URI_DOTEDU                     2.000
+score URI_DOTEDU                     1.999
 score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               2.299
+score URI_GOOGLE_PROXY               2.300
 score URI_IN_URI_10                  2.499
-score URI_ONLY_MSGID_MALF            1.375
-score URI_PHISH                      2.376
-score URI_PHP_REDIR                  3.298
+score URI_ONLY_MSGID_MALF            1.405
+score URI_PHISH                      2.380
+score URI_PHP_REDIR                  3.296
 score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.299
-score URI_WP_DIRINDEX                3.489
+score URI_WP_DIRINDEX                3.496
 score URI_WP_HACKED                  3.499
 score URI_WP_HACKED_2                1.596
 score WORD_INVIS_MANY                2.999
 score XM_RANDOM                      2.499
-score XM_RECPTID                     2.999
+score XM_RECPTID                     3.000
 score XPRIO                          0.001
-score XPRIO_SHORT_SUBJ               2.340
-score YOUR_DELIVERY_ADDRESS          1.250
-score YOU_INHERIT                    2.499
+score XPRIO_SHORT_SUBJ               0.036
+score YOUR_DELIVERY_ADDRESS          1.249
+score YOU_INHERIT                    2.500
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -315,7 +315,6 @@
 score MALF_HTML_B64                  1.000
 score MALWARE_NORDNS                 1.000
 score MALWARE_PASSWORD               1.000
-score MANY_HDRS_LCASE                0.100
 score MIME_NO_TEXT                   1.000
 score MIXED_AREA_CASE                1.000
 score MIXED_CENTER_CASE              1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 1e6bfb6..91e0153 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: 241125  46.637%  (99.581% of non-spam corpus)
-# Correctly spam:     192725  37.275%  (70.110% of spam corpus)
-# False positives:      1015  0.196%  (0.419% of nonspam,  34241 weighted)
-# False negatives:     82165  15.892%  (29.890% of spam, 154462 weighted)
-# Average score for spam:  10.3    nonspam: 0.7
-# Average for false-pos:   5.9  false-neg: 1.9
-# TOTAL:              517030  100.00%
+# Correctly non-spam: 241008  47.426%  (99.586% of non-spam corpus)
+# Correctly spam:     186471  36.694%  (70.059% of spam corpus)
+# False positives:      1003  0.197%  (0.414% of nonspam,  38463 weighted)
+# False negatives:     79690  15.682%  (29.941% of spam, 152639 weighted)
+# Average score for spam:  10.1    nonspam: 0.7
+# Average for false-pos:   7.0  false-neg: 1.9
+# TOTAL:              508172  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  30176  99.60%
-# Correctly spam:      24020  69.87%
-# False positives:       121  0.40%
-# False negatives:     10356  30.13%
-# TCR(l=50): 2.095331  SpamRecall: 69.874%  SpamPrec: 99.499%
+# Correctly non-spam:  30166  99.60%
+# Correctly spam:      23242  69.81%
+# False positives:       120  0.40%
+# False negatives:     10053  30.19%
+# TCR(l=50): 2.074067  SpamRecall: 69.806%  SpamPrec: 99.486%
 
 ##### 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: 233196  96.31%
-# Correctly spam:     162878  59.25%
-# False positives:      8944  3.69%
-# False negatives:    112012  40.75%
-# TCR(l=50): 0.491567  SpamRecall: 59.252%  SpamPrec: 94.795%
+# Correctly non-spam: 232986  96.27%
+# Correctly spam:     156379  58.75%
+# False positives:      9025  3.73%
+# False negatives:    109782  41.25%
+# TCR(l=50): 0.474413  SpamRecall: 58.754%  SpamPrec: 94.544%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  29125  96.13%
-# Correctly spam:      20516  59.68%
-# False positives:      1172  3.87%
-# False negatives:     13860  40.32%
-# TCR(l=50): 0.474413  SpamRecall: 59.681%  SpamPrec: 94.596%
+# Correctly non-spam:  29196  96.40%
+# Correctly spam:      19513  58.61%
+# False positives:      1090  3.60%
+# False negatives:     13782  41.39%
+# TCR(l=50): 0.487610  SpamRecall: 58.606%  SpamPrec: 94.710%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 72fa5c5..f13f031 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,23 +1,23 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 242960  46.638%  (99.505% of non-spam corpus)
-# Correctly spam:     225782  43.341%  (81.576% of spam corpus)
-# False positives:      1208  0.232%  (0.495% of nonspam, 101540 weighted)
-# False negatives:     50994  9.789%  (18.424% of spam, 102489 weighted)
+# Correctly non-spam: 242956  46.638%  (99.504% of non-spam corpus)
+# Correctly spam:     225684  43.322%  (81.541% of spam corpus)
+# False positives:      1212  0.233%  (0.496% of nonspam, 101808 weighted)
+# False negatives:     51091  9.807%  (18.459% of spam, 102655 weighted)
 # Average score for spam:  17.6    nonspam: -0.8
 # Average for false-pos:   7.4  false-neg: 2.0
-# TOTAL:              520944  100.00%
+# TOTAL:              520943  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  30360  99.48%
-# Correctly spam:      28182  81.41%
-# False positives:       158  0.52%
-# False negatives:      6437  18.59%
-# TCR(l=50): 2.414661  SpamRecall: 81.406%  SpamPrec: 99.442%
+# Correctly non-spam:  30359  99.48%
+# Correctly spam:      28240  81.57%
+# False positives:       159  0.52%
+# False negatives:      6379  18.43%
+# TCR(l=50): 2.416009  SpamRecall: 81.574%  SpamPrec: 99.440%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam: 243107  99.57%
-# Correctly spam:     175397  63.37%
+# Correctly spam:     175335  63.35%
 # False positives:      1061  0.43%
-# False negatives:    101379  36.63%
-# TCR(l=50): 1.792254  SpamRecall: 63.371%  SpamPrec: 99.399%
+# False negatives:    101440  36.65%
+# TCR(l=50): 1.791540  SpamRecall: 63.349%  SpamPrec: 99.399%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam:  30371  99.52%
-# Correctly spam:      21961  63.44%
+# Correctly spam:      21981  63.49%
 # False positives:       147  0.48%
-# False negatives:     12658  36.56%
-# TCR(l=50): 1.730258  SpamRecall: 63.436%  SpamPrec: 99.335%
+# False negatives:     12638  36.51%
+# TCR(l=50): 1.731989  SpamRecall: 63.494%  SpamPrec: 99.336%