updated scores for revision 1921104 active rules added since last mass-check git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1921123 13f79535-47bb-0310-9956-ffa450edef68

commit: a70a07a3943a6d0a0348e74b1b94b51f6fc841d6 [log] [tgz]
author: spamassassin_role <spamassassin_role@unknown> Sat Oct 05 02:50:23 2024 +0000
committer: spamassassin_role <spamassassin_role@unknown> Sat Oct 05 02:50:23 2024 +0000
tree: 279e8588fbf1ddc47ae584cec95002b0b637d50d
parent: 263c43778f386362ab15fda09b075fd229821efe [diff]
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index ef3882e..6590c8f 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf

@@ -1,9 +1,9 @@
-score ACCT_PHISHING_MANY                    2.999 3.000 2.999 3.000
+score ACCT_PHISHING_MANY                    2.999 2.999 2.999 2.999
 score AC_BR_BONANZA                         0.001 0.001 0.001 0.001
 score AC_DIV_BONANZA                        0.001 0.001 0.001 0.001
-score AC_FROM_MANY_DOTS                     2.499 2.500 2.499 2.500
+score AC_FROM_MANY_DOTS                     2.499 2.499 2.499 2.499
 score AC_HTML_NONSENSE_TAGS                 1.999 1.999 1.999 1.999
-score AC_POST_EXTRAS                        0.001 0.793 0.001 0.793
+score AC_POST_EXTRAS                        1.000 0.685 1.000 0.685
 score AC_SPAMMY_URI_PATTERNS1               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS10              1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS11              1.000 1.000 1.000 1.000
@@ -13,89 +13,90 @@
 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                           1.786 1.920 1.786 1.920
+score ADMITS_SPAM                           2.182 1.815 2.182 1.815
 score ADULT_DATING_COMPANY                  10.000 10.000 10.000 10.000
-score ADVANCE_FEE_2_NEW_FORM                1.999 1.139 1.999 1.139
-score ADVANCE_FEE_2_NEW_FRM_MNY             0.001 0.783 0.001 0.783
-score ADVANCE_FEE_2_NEW_MONEY               1.677 2.000 1.677 2.000
-score ADVANCE_FEE_3_NEW                     3.499 0.001 3.499 0.001
-score ADVANCE_FEE_3_NEW_FRM_MNY             1.789 1.924 1.789 1.924
-score ADVANCE_FEE_3_NEW_MONEY               1.632 1.232 1.632 1.232
-score ADVANCE_FEE_4_NEW                     3.199 0.001 3.199 0.001
+score ADVANCE_FEE_2_NEW_FORM                2.000 1.146 2.000 1.146
+score ADVANCE_FEE_2_NEW_FRM_MNY             0.001 1.519 0.001 1.519
+score ADVANCE_FEE_2_NEW_MONEY               1.397 1.999 1.397 1.999
+score ADVANCE_FEE_3_NEW                     3.450 0.001 3.450 0.001
+score ADVANCE_FEE_3_NEW_FRM_MNY             1.498 1.502 1.498 1.502
+score ADVANCE_FEE_3_NEW_MONEY               2.899 1.237 2.899 1.237
+score ADVANCE_FEE_4_NEW                     2.250 0.001 2.250 0.001
 score ADVANCE_FEE_4_NEW_FRM_MNY             0.001 0.001 0.001 0.001
 score ADVANCE_FEE_4_NEW_MONEY               0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW                     2.499 0.001 2.499 0.001
+score ADVANCE_FEE_5_NEW                     2.485 0.001 2.485 0.001
 score ADVANCE_FEE_5_NEW_FRM_MNY             0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW_MONEY               1.381 0.001 1.381 0.001
-score AD_PREFS                              0.499 0.250 0.499 0.250
+score ADVANCE_FEE_5_NEW_MONEY               0.001 0.001 0.001 0.001
+score AD_PREFS                              0.500 0.250 0.500 0.250
 score ALIBABA_IMG_NOT_RCVD_ALI              1.000 1.000 1.000 1.000
-score AMAZON_IMG_NOT_RCVD_AMZN              2.499 0.807 2.499 0.807
+score AMAZON_IMG_NOT_RCVD_AMZN              2.499 0.802 2.499 0.802
 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.658 0.001 0.658 0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          1.673 0.001 1.673 0.001
 score BEBEE_IMG_NOT_RCVD_BB                 1.000 1.000 1.000 1.000
-score BIGNUM_EMAILS_FREEM                   0.806 0.001 0.806 0.001
-score BIGNUM_EMAILS_MANY                    2.999 2.999 2.999 2.999
+score BIGNUM_EMAILS_FREEM                   0.001 0.001 0.001 0.001
+score BIGNUM_EMAILS_MANY                    3.000 2.999 3.000 2.999
 score BITCOIN_BOMB                          1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE                      2.999 3.000 2.999 3.000
-score BITCOIN_EXTORT_01                     3.001 3.000 3.001 3.000
+score BITCOIN_DEADLINE                      2.999 2.999 2.999 2.999
+score BITCOIN_EXTORT_01                     4.248 2.999 4.248 2.999
 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                     0.001 0.001 0.001 0.001
 score BITCOIN_MALWARE                       0.001 0.001 0.001 0.001
 score BITCOIN_OBFU_SUBJ                     1.000 1.000 1.000 1.000
 score BITCOIN_ONAN                          1.000 1.000 1.000 1.000
-score BITCOIN_PAY_ME                        2.361 2.999 2.361 2.999
+score BITCOIN_PAY_ME                        1.000 2.999 1.000 2.999
 score BITCOIN_SPAM_01                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_02                       1.900 2.499 1.900 2.499
+score BITCOIN_SPAM_02                       2.152 2.423 2.152 2.423
 score BITCOIN_SPAM_03                       2.499 2.499 2.499 2.499
 score BITCOIN_SPAM_04                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_05                       0.001 2.499 0.001 2.499
 score BITCOIN_SPAM_06                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07                       1.620 0.001 1.620 0.001
+score BITCOIN_SPAM_07                       0.815 0.001 0.815 0.001
 score BITCOIN_SPAM_08                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_09                       1.499 1.499 1.499 1.499
 score BITCOIN_SPAM_10                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_11                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_12                       1.000 1.000 1.000 1.000
 score BITCOIN_SPF_ONLYALL                   0.001 1.000 0.001 1.000
-score BITCOIN_TOEQFM                        2.630 1.423 2.630 1.423
+score BITCOIN_TOEQFM                        3.059 1.418 3.059 1.418
 score BITCOIN_VISTA                         0.001 0.001 0.001 0.001
 score BITCOIN_XPRIO                         2.499 0.001 2.499 0.001
-score BITCOIN_YOUR_INFO                     0.361 0.301 0.361 0.301
+score BITCOIN_YOUR_INFO                     0.399 0.966 0.399 0.966
 score BODY_EMAIL_419_FRAUD_GM               2.499 1.000 2.499 1.000
-score BODY_URI_ONLY                         2.247 0.925 2.247 0.925
+score BODY_URI_ONLY                         1.857 0.926 1.857 0.926
 score BOGUS_MIME_VERSION                    3.499 3.499 3.499 3.499
 score BOGUS_MSM_HDRS                        1.000 1.000 1.000 1.000
 score BOMB_FREEM                            1.000 1.000 1.000 1.000
 score BOMB_MONEY                            1.000 1.000 1.000 1.000
 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.257 1.000 1.257 1.000
-score CN_B2B_SPAMMER                        2.399 2.299 2.399 2.299
+score CANT_SEE_AD                           1.492 1.000 1.492 1.000
+score CN_B2B_SPAMMER                        2.299 2.300 2.299 2.300
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
-score COMPENSATION                          1.499 1.444 1.499 1.444
+score COMPENSATION                          1.500 1.219 1.500 1.219
 score CONTENT_AFTER_HTML                    1.000 1.000 1.000 1.000
 score CONTENT_AFTER_HTML_WEAK               1.499 1.499 1.499 1.499
-score CTE_8BIT_MISMATCH                     0.999 0.257 0.999 0.257
+score CTE_8BIT_MISMATCH                     0.999 0.258 0.999 0.258
 score DAY_I_EARNED                          1.000 1.000 1.000 1.000
 score DEAR_BENEFICIARY                      0.001 0.001 0.001 0.001
-score DEAR_NOBODY                           3.199 2.425 3.199 2.425
-score DKIMWL_BL                             0.001 2.431 0.001 2.431
+score DEAR_NOBODY                           2.848 2.419 2.848 2.419
+score DKIMWL_BL                             0.001 0.172 0.001 0.172
 score DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH                        0.001 -0.146 0.001 -0.146
+score DKIMWL_WL_HIGH                        0.001 -0.144 0.001 -0.144
 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 DOS_BODY_HIGH_NO_MID                  3.699 3.269 3.699 3.269
+score DOS_BODY_HIGH_NO_MID                  3.699 3.274 3.699 3.274
 score DOTGOV_IMAGE                          1.000 1.000 1.000 1.000
-score DSN_NO_MIMEVERSION                    2.000 1.999 2.000 1.999
-score DUP_SUSP_HDR                          1.823 1.130 1.823 1.130
+score DSN_NO_MIMEVERSION                    1.999 1.999 1.999 1.999
+score DUP_SUSP_HDR                          0.594 0.403 0.594 0.403
 score DYNAMIC_IMGUR                         0.001 0.001 0.001 0.001
 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
-score END_FUTURE_EMAILS                     2.499 1.933 2.499 1.933
+score ENCRYPTED_MESSAGE                     -0.999 -1.000 -0.999 -1.000
+score END_FUTURE_EMAILS                     2.499 1.832 2.499 1.832
 score ENVFROM_GOOG_TRIX                     1.000 1.000 1.000 1.000
 score FACEBOOK_IMG_NOT_RCVD_FB              1.999 1.999 1.999 1.999
 score FBI_MONEY                             0.001 0.001 0.001 0.001
@@ -104,10 +105,10 @@
 score FONT_INVIS_DIRECT                     1.000 1.000 1.000 1.000
 score FONT_INVIS_DOTGOV                     1.000 1.000 1.000 1.000
 score FONT_INVIS_HTML_NOHTML                1.000 1.000 1.000 1.000
-score FONT_INVIS_LONG_LINE                  2.999 2.999 2.999 2.999
-score FONT_INVIS_MSGID                      2.499 2.499 2.499 2.499
-score FONT_INVIS_NORDNS                     0.004 0.001 0.004 0.001
-score FONT_INVIS_POSTEXTRAS                 2.652 1.509 2.652 1.509
+score FONT_INVIS_LONG_LINE                  3.000 2.999 3.000 2.999
+score FONT_INVIS_MSGID                      2.500 2.499 2.500 2.499
+score FONT_INVIS_NORDNS                     0.001 0.001 0.001 0.001
+score FONT_INVIS_POSTEXTRAS                 2.286 1.610 2.286 1.610
 score FORM_FRAUD                            0.999 0.999 0.999 0.999
 score FORM_FRAUD_3                          0.001 2.799 0.001 2.799
 score FORM_FRAUD_5                          0.001 0.001 0.001 0.001
@@ -115,59 +116,58 @@
 score FREEMAIL_FORGED_FROMDOMAIN            0.250 0.001 0.250 0.001
 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_ADDR_WS                          2.999 2.151 2.999 2.151
-score FROM_BANK_NOAUTH                      0.001 0.999 0.001 0.999
+score FROM_ADDR_WS                          2.999 2.145 2.999 2.145
+score FROM_BANK_NOAUTH                      0.001 1.000 0.001 1.000
 score FROM_FMBLA_NDBLOCKED                  0.001 0.001 0.001 0.001
 score FROM_FMBLA_NEWDOM                     0.001 1.499 0.001 1.499
-score FROM_FMBLA_NEWDOM14                   0.001 0.005 0.001 0.005
+score FROM_FMBLA_NEWDOM14                   0.001 0.007 0.001 0.007
 score FROM_FMBLA_NEWDOM28                   0.001 0.799 0.001 0.799
-score FROM_GOV_DKIM_AU                      0.001 -0.368 0.001 -0.368
+score FROM_GOV_DKIM_AU                      0.001 -0.787 0.001 -0.787
 score FROM_GOV_REPLYTO_FREEMAIL             0.001 1.000 0.001 1.000
 score FROM_GOV_SPOOF                        0.001 0.999 0.001 0.999
-score FROM_IN_TO_AND_SUBJ                   1.499 1.300 1.499 1.300
+score FROM_IN_TO_AND_SUBJ                   1.399 1.299 1.399 1.299
 score FROM_LONG_DOM                         1.499 1.499 1.499 1.499
-score FROM_LONG_DOM_MINFP                   2.499 2.499 2.499 2.499
+score FROM_LONG_DOM_MINFP                   2.500 2.499 2.500 2.499
 score FROM_MISSPACED                        0.001 0.001 0.001 0.001
 score FROM_MISSP_DYNIP                      0.001 0.001 0.001 0.001
 score FROM_MISSP_EH_MATCH                   0.001 0.001 0.001 0.001
-score FROM_MISSP_FREEMAIL                   2.147 0.817 2.147 0.817
+score FROM_MISSP_FREEMAIL                   1.747 0.748 1.747 0.748
 score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
 score FROM_MISSP_PHISH                      3.499 3.499 3.499 3.499
-score FROM_MISSP_REPLYTO                    2.499 0.892 2.499 0.892
+score FROM_MISSP_REPLYTO                    2.098 0.891 2.098 0.891
 score FROM_MISSP_SPF_FAIL                   0.001 0.001 0.001 0.001
-score FROM_MISSP_TO_UNDISC                  0.697 1.740 0.697 1.740
+score FROM_MISSP_TO_UNDISC                  0.733 1.419 0.733 1.419
 score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
 score FROM_NEWDOM_BTC                       0.001 1.000 0.001 1.000
-score FROM_NTLD_LINKBAIT                    0.001 1.594 0.001 1.594
-score FROM_NTLD_REPLY_FREEMAIL              1.885 0.001 1.885 0.001
+score FROM_NTLD_LINKBAIT                    1.035 0.899 1.035 0.899
+score FROM_NTLD_REPLY_FREEMAIL              1.422 0.001 1.422 0.001
 score FROM_NUMBERO_NEWDOMAIN                0.001 1.000 0.001 1.000
 score FROM_PAYPAL_SPOOF                     0.001 1.000 0.001 1.000
-score FROM_SUSPICIOUS_NTLD                  0.499 0.499 0.499 0.499
-score FROM_SUSPICIOUS_NTLD_FP               1.786 2.000 1.786 2.000
-score FROM_UNBAL1                           2.600 2.599 2.600 2.599
+score FROM_SUSPICIOUS_NTLD                  0.500 0.499 0.500 0.499
+score FROM_SUSPICIOUS_NTLD_FP               1.786 1.999 1.786 1.999
+score FROM_UNBAL1                           2.599 2.599 2.599 2.599
 score FROM_UNBAL2                           2.599 2.599 2.599 2.599
 score FROM_WSP_TRAIL                        2.599 2.399 2.599 2.399
-score FSL_BULK_SIG                          0.001 0.383 0.001 0.383
+score FSL_BULK_SIG                          0.001 0.434 0.001 0.434
 score FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
-score FSL_HAS_TINYURL                       3.399 2.689 3.399 2.689
-score FSL_HELO_BARE_IP_2                    2.502 1.162 2.502 1.162
+score FSL_HAS_TINYURL                       3.187 2.700 3.187 2.700
+score FSL_HELO_BARE_IP_2                    2.249 1.164 2.249 1.164
 score FSL_NEW_HELO_USER                     0.001 0.001 0.001 0.001
-score FUZZY_AMAZON                          3.100 3.099 3.100 3.099
-score FUZZY_APPLE                           3.121 2.699 3.121 2.699
-score FUZZY_BITCOIN                         2.499 2.299 2.499 2.299
+score FUZZY_AMAZON                          3.099 3.099 3.099 3.099
+score FUZZY_APPLE                           2.957 2.699 2.957 2.699
+score FUZZY_BITCOIN                         2.219 2.299 2.219 2.299
 score FUZZY_IMPORTANT                       2.699 2.599 2.699 2.599
-score FUZZY_TRUMP                           1.714 3.755 1.714 3.755
-score FUZZY_TRUSTWALLET                     2.199 2.299 2.199 2.299
-score FUZZY_WALLET                          0.001 0.633 0.001 0.633
+score FUZZY_TRUMP                           3.299 3.036 3.299 3.036
+score FUZZY_WALLET                          0.001 0.640 0.001 0.640
 score GAPPY_HTML                            3.099 0.001 3.099 0.001
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
-score GB_CUSTOM_HTM_URI                     1.432 1.499 1.432 1.499
-score GB_FAKE_RF_SHORT                      0.414 1.257 0.414 1.257
+score GB_CUSTOM_HTM_URI                     1.499 1.499 1.499 1.499
+score GB_FAKE_RF_SHORT                      0.392 1.257 0.392 1.257
 score GB_FORGED_MUA_POSTFIX                 1.000 1.000 1.000 1.000
 score GB_FREEMAIL_DISPTO                    0.001 0.001 0.001 0.001
 score GB_FREEMAIL_DISPTO_NOTFREEM           0.499 0.499 0.499 0.499
 score GB_GOOGLE_OBFUR                       0.750 0.750 0.750 0.750
-score GB_HASHBL_BTC                         0.001 0.701 0.001 0.701
+score GB_HASHBL_BTC                         0.001 0.696 0.001 0.696
 score GB_STORAGE_GOOGLE_EMAIL               1.000 1.000 1.000 1.000
 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
@@ -180,118 +180,119 @@
 score GOOG_STO_IMG_HTML                     1.000 1.000 1.000 1.000
 score GOOG_STO_IMG_NOHTML                   2.499 0.001 2.499 0.001
 score GOOG_STO_NOIMG_HTML                   2.999 2.999 2.999 2.999
-score HAS_X_NO_RELAY                        1.265 0.401 1.265 0.401
+score HAS_X_NO_RELAY                        1.488 1.379 1.488 1.379
 score HAS_X_OUTGOING_SPAM_STAT              1.000 1.000 1.000 1.000
-score HDRS_MISSP                            0.001 2.352 0.001 2.352
+score HDRS_LCASE                            0.100 0.001 0.100 0.001
+score HDRS_MISSP                            0.001 2.353 0.001 2.353
 score HDR_ORDER_FTSDMCXX_DIRECT             0.001 0.001 0.001 0.001
 score HDR_ORDER_FTSDMCXX_NORDNS             0.001 0.001 0.001 0.001
 score HEADER_FROM_DIFFERENT_DOMAINS         0.250 0.249 0.250 0.249
 score HELO_NO_DOMAIN                        0.001 0.001 0.001 0.001
 score HEXHASH_WORD                          1.000 1.000 1.000 1.000
 score HK_CTE_RAW                            1.000 1.000 1.000 1.000
-score HK_LOTTO                              0.999 1.000 0.999 1.000
-score HK_NAME_FM_MR_MRS                     1.499 0.038 1.499 0.038
+score HK_LOTTO                              0.999 0.999 0.999 0.999
+score HK_NAME_FM_MR_MRS                     1.499 0.239 1.499 0.239
 score HK_NAME_MR_MRS                        0.999 0.999 0.999 0.999
 score HK_RANDOM_ENVFROM                     0.999 0.001 0.999 0.001
-score HK_RANDOM_FROM                        1.000 0.999 1.000 0.999
-score HK_RANDOM_REPLYTO                     1.000 0.999 1.000 0.999
+score HK_RANDOM_FROM                        0.999 0.999 0.999 0.999
+score HK_RANDOM_REPLYTO                     0.999 0.999 0.999 0.999
 score HK_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
 score HK_SCAM                               1.999 0.001 1.999 0.001
 score HK_WIN                                0.999 0.999 0.999 0.999
-score HOSTED_IMG_DIRECT_MX                  3.499 2.077 3.499 2.077
+score HOSTED_IMG_DIRECT_MX                  1.750 1.614 1.750 1.614
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
 score HOSTED_IMG_FREEM                      3.499 0.001 3.499 0.001
 score HOSTED_IMG_MULTI                      1.000 1.000 1.000 1.000
-score HOSTED_IMG_MULTI_PUB_01               1.837 0.649 1.837 0.649
-score HREF_EMPTY_NORDNS                     0.001 0.307 0.001 0.307
+score HOSTED_IMG_MULTI_PUB_01               1.836 0.648 1.836 0.648
+score HREF_EMPTY_NORDNS                     0.001 0.379 0.001 0.379
 score HREF_EMPTY_PHPMAIL                    1.000 1.000 1.000 1.000
-score HREF_EMPTY_XANTIABUSE                 1.000 1.000 1.000 1.000
-score HREF_EMPTY_XAUTHED                    1.000 1.000 1.000 1.000
+score HREF_EMPTY_XANTIABUSE                 2.482 1.000 2.482 1.000
+score HREF_EMPTY_XAUTHED                    2.317 1.000 2.317 1.000
 score HTML_BADATTR                          0.999 1.000 0.999 1.000
-score HTML_ENTITY_ASCII                     3.000 2.999 3.000 2.999
-score HTML_ENTITY_ASCII_TINY                2.391 1.000 2.391 1.000
+score HTML_ENTITY_ASCII                     2.999 2.999 2.999 2.999
+score HTML_ENTITY_ASCII_TINY                2.650 1.000 2.650 1.000
 score HTML_OFF_PAGE                         1.000 1.000 1.000 1.000
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY                     1.988 1.674 1.988 1.674
+score HTML_SINGLET_MANY                     1.817 1.675 1.817 1.675
 score HTML_TEXT_INVISIBLE_FONT              0.001 0.001 0.001 0.001
-score HTML_TEXT_INVISIBLE_STYLE             0.267 2.634 0.267 2.634
-score IMG_ONLY_FM_DOM_INFO                  1.000 0.782 1.000 0.782
+score HTML_TEXT_INVISIBLE_STYLE             0.251 2.625 0.251 2.625
+score IMG_ONLY_FM_DOM_INFO                  2.100 0.779 2.100 0.779
 score JH_SPAMMY_HEADERS                     1.000 1.000 1.000 1.000
 score JH_SPAMMY_PATTERN01                   1.000 1.000 1.000 1.000
 score JH_SPAMMY_PATTERN02                   1.000 1.000 1.000 1.000
-score KHOP_FAKE_EBAY                        0.999 0.001 0.999 0.001
+score KHOP_HELO_FCRDNS                      0.400 0.001 0.400 0.001
 score LINKEDIN_IMG_NOT_RCVD_LNKN            1.000 1.000 1.000 1.000
 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                          3.000 1.571 3.000 1.571
-score LONG_IMG_URI                          0.001 1.399 0.001 1.399
-score LONG_INVISIBLE_TEXT                   2.499 1.747 2.499 1.747
+score LONG_HEX_URI                          2.653 1.671 2.653 1.671
+score LONG_IMG_URI                          0.001 1.263 0.001 1.263
+score LONG_INVISIBLE_TEXT                   2.003 1.750 2.003 1.750
 score LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
-score LOTTO_AGENT                           1.499 0.001 1.499 0.001
+score LOTTO_AGENT                           0.001 0.001 0.001 0.001
 score LOTTO_DEPT                            1.999 1.999 1.999 1.999
 score LUCRATIVE                             1.000 1.000 1.000 1.000
-score MALFORMED_FREEMAIL                    2.569 2.045 2.569 2.045
+score MALFORMED_FREEMAIL                    2.398 2.043 2.398 2.043
 score MALF_HTML_B64                         1.000 1.000 1.000 1.000
 score MALWARE_NORDNS                        0.001 0.001 0.001 0.001
 score MALWARE_PASSWORD                      0.001 0.001 0.001 0.001
 score MALW_ATTACH                           2.299 2.199 2.299 2.199
 score MANY_HDRS_LCASE                       0.100 0.001 0.100 0.001
-score MANY_SPAN_IN_TEXT                     1.864 2.299 1.864 2.299
-score MANY_SUBDOM                           3.299 3.199 3.299 3.199
-score MAY_BE_FORGED                         2.245 0.001 2.245 0.001
-score MILLION_EUR                           2.356 0.001 2.356 0.001
+score MANY_SPAN_IN_TEXT                     1.626 2.299 1.626 2.299
+score MANY_SUBDOM                           3.299 3.164 3.299 3.164
+score MAY_BE_FORGED                         2.264 0.001 2.264 0.001
+score MILLION_EUR                           1.348 0.001 1.348 0.001
 score MILLION_HUNDRED                       0.001 0.001 0.001 0.001
 score MIMEOLE_DIRECT_TO_MX                  0.001 0.001 0.001 0.001
-score MIME_NO_TEXT                          1.999 1.741 1.999 1.741
+score MIME_NO_TEXT                          1.999 1.755 1.999 1.755
 score MIXED_AREA_CASE                       1.000 1.000 1.000 1.000
-score MIXED_CENTER_CASE                     2.499 2.499 2.499 2.499
+score MIXED_CENTER_CASE                     2.500 2.499 2.500 2.499
 score MIXED_CTYPE_CASE                      2.499 2.399 2.499 2.399
-score MIXED_ES                              2.699 2.699 2.699 2.699
+score MIXED_ES                              2.699 2.700 2.699 2.700
 score MIXED_FONT_CASE                       1.000 1.000 1.000 1.000
-score MIXED_HREF_CASE                       1.937 1.898 1.937 1.898
+score MIXED_HREF_CASE                       1.803 1.851 1.803 1.851
 score MIXED_IMG_CASE                        1.000 1.000 1.000 1.000
 score MONERO_DEADLINE                       1.000 1.000 1.000 1.000
 score MONERO_EXTORT_01                      1.000 1.000 1.000 1.000
 score MONERO_MALWARE                        1.000 1.000 1.000 1.000
 score MONERO_PAY_ME                         1.000 1.000 1.000 1.000
 score MONEY_FORM_SHORT                      0.001 0.001 0.001 0.001
-score MONEY_FRAUD_3                         0.001 2.899 0.001 2.899
+score MONEY_FRAUD_3                         0.001 2.779 0.001 2.779
 score MONEY_FRAUD_5                         0.001 0.001 0.001 0.001
 score MONEY_FRAUD_8                         0.001 0.001 0.001 0.001
-score MONEY_FREEMAIL_REPTO                  1.855 0.001 1.855 0.001
-score MONEY_FROM_41                         1.685 0.841 1.685 0.841
+score MONEY_FREEMAIL_REPTO                  2.144 0.004 2.144 0.004
+score MONEY_FROM_41                         1.394 0.775 1.394 0.775
 score MONEY_FROM_MISSP                      0.001 0.001 0.001 0.001
-score MONEY_NOHTML                          1.885 1.491 1.885 1.491
+score MONEY_NOHTML                          2.499 1.570 2.499 1.570
 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 MSM_PRIO_REPTO                        2.499 2.499 2.499 2.499
-score NA_DOLLARS                            1.499 0.046 1.499 0.046
+score MSM_PRIO_REPTO                        2.499 2.434 2.499 2.434
+score NA_DOLLARS                            1.499 0.052 1.499 0.052
 score NEWEGG_IMG_NOT_RCVD_NEGG              1.000 1.000 1.000 1.000
 score NEW_PRODUCTS                          1.000 1.000 1.000 1.000
-score NICE_REPLY_A                          -0.080 -1.206 -0.080 -1.206
-score NORDNS_LOW_CONTRAST                   1.787 1.084 1.787 1.084
+score NICE_REPLY_A                          -3.560 -2.890 -3.560 -2.890
+score NORDNS_LOW_CONTRAST                   1.786 1.064 1.786 1.064
 score NO_FM_NAME_IP_HOSTN                   0.001 0.001 0.001 0.001
 score NSL_RCVD_FROM_USER                    0.001 0.001 0.001 0.001
-score NSL_RCVD_HELO_USER                    0.001 1.724 0.001 1.724
-score OBFU_BITCOIN                          0.728 0.618 0.728 0.618
-score ODD_FREEM_REPTO                       2.999 1.394 2.999 1.394
+score NSL_RCVD_HELO_USER                    0.001 0.662 0.001 0.662
+score OBFU_BITCOIN                          0.969 0.001 0.969 0.001
+score ODD_FREEM_REPTO                       2.999 1.397 2.999 1.397
 score PDS_BAD_THREAD_QP_64                  0.999 0.001 0.999 0.001
-score PDS_BTC_ID                            0.500 0.499 0.500 0.499
+score PDS_BTC_ID                            0.499 0.500 0.499 0.500
 score PDS_BTC_MSGID                         0.999 0.001 0.999 0.001
 score PDS_CPANEL_PORT_SPOOFEDURL            0.499 0.001 0.499 0.001
-score PDS_DBL_URL_LINKBAIT                  1.185 0.001 1.185 0.001
-score PDS_HELO_SPF_FAIL                     0.001 1.999 0.001 1.999
-score PDS_OTHER_BAD_TLD                     1.999 2.000 1.999 2.000
+score PDS_DBL_URL_LINKBAIT                  1.176 0.001 1.176 0.001
+score PDS_HELO_SPF_FAIL                     0.001 2.000 0.001 2.000
+score PDS_OTHER_BAD_TLD                     1.999 1.999 1.999 1.999
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.999 1.999 1.999 1.999
-score PDS_URISHRT_LOCALPART_SUBJ            0.999 1.000 0.999 1.000
+score PDS_URISHRT_LOCALPART_SUBJ            0.001 1.000 0.001 1.000
 score PHISH_ATTACH                          2.399 2.299 2.399 2.299
 score PHISH_AZURE_CLOUDAPP                  3.500 3.500 3.500 3.500
 score PHISH_FBASEAPP                        1.000 1.000 1.000 1.000
 score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT                       1.305 1.871 1.305 1.871
-score PHP_SCRIPT                            2.499 2.499 2.499 2.499
+score PHP_ORIG_SCRIPT                       1.296 1.874 1.296 1.874
+score PHP_SCRIPT                            2.499 2.500 2.499 2.500
 score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT               1.000 0.261 1.000 0.261
+score PP_MIME_FAKE_ASCII_TEXT               0.999 0.261 0.999 0.261
 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
@@ -299,7 +300,7 @@
 score RAND_HEADER_LIST_SPOOF                1.000 1.000 1.000 1.000
 score RAND_HEADER_MANY                      1.000 1.000 1.000 1.000
 score RAND_MKTG_HEADER                      1.000 1.000 1.000 1.000
-score RATWARE_NO_RDNS                       0.290 0.427 0.290 0.427
+score RATWARE_NO_RDNS                       2.728 2.859 2.728 2.859
 score RCVD_DOTEDU_SHORT                     1.000 1.000 1.000 1.000
 score RCVD_DOTEDU_SUSP_URI                  1.000 1.000 1.000 1.000
 score RCVD_IN_IADB_COURT                    0.001 -0.001 0.001 -0.001
@@ -320,13 +321,13 @@
 score RCVD_IN_MSPIKE_ZBI                    0.001 0.001 0.001 0.001
 score RDNS_NUM_TLD_ATCHNX                   1.000 1.000 1.000 1.000
 score RDNS_NUM_TLD_XM                       1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD                       3.000 2.999 3.000 2.999
+score REPTO_419_FRAUD                       2.838 2.999 2.838 2.999
 score REPTO_419_FRAUD_AOL                   1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL_LOOSE             1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_CNS                   1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_GM                    2.802 1.531 2.802 1.531
-score REPTO_419_FRAUD_GM_LOOSE              0.999 0.999 0.999 0.999
-score REPTO_419_FRAUD_HM                    3.000 2.513 3.000 2.513
+score REPTO_419_FRAUD_GM                    2.403 1.502 2.403 1.502
+score REPTO_419_FRAUD_GM_LOOSE              0.999 1.000 0.999 1.000
+score REPTO_419_FRAUD_HM                    2.999 2.509 2.999 2.509
 score REPTO_419_FRAUD_OL                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_PM                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_QQ                    1.000 1.000 1.000 1.000
@@ -335,8 +336,8 @@
 score REPTO_419_FRAUD_YJ                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_YN                    1.000 1.000 1.000 1.000
 score RISK_FREE                             2.599 2.499 2.599 2.499
-score SCC_BOGUS_CTE_1                       0.001 1.259 0.001 1.259
-score SCC_CANSPAM_2                         4.270 4.099 4.270 4.099
+score SCC_BOGUS_CTE_1                       0.001 1.307 0.001 1.307
+score SCC_CANSPAM_2                         4.282 3.341 4.282 3.341
 score SCC_ISEMM_LID_1                       1.000 1.000 1.000 1.000
 score SCC_ISEMM_LID_1A                      1.000 1.000 1.000 1.000
 score SCC_ISEMM_LID_1B                      1.499 1.499 1.499 1.499
@@ -344,99 +345,100 @@
 score SENDGRID_REDIR_PHISH                  1.000 1.000 1.000 1.000
 score SEO_SUSP_NTLD                         1.000 1.000 1.000 1.000
 score SHOPIFY_IMG_NOT_RCVD_SFY              2.499 2.499 2.499 2.499
-score SHORTENER_SHORT_IMG                   0.188 2.499 0.188 2.499
-score SHORT_IMG_SUSP_NTLD                   0.686 1.499 0.686 1.499
+score SHORTENER_SHORT_IMG                   2.499 2.499 2.499 2.499
+score SHORT_IMG_SUSP_NTLD                   1.223 0.486 1.223 0.486
 score SHY_OBFU_EXPIRE                       1.000 1.000 1.000 1.000
 score SHY_OBFU_PASSWORD                     1.000 1.000 1.000 1.000
 score SPOOFED_FREEMAIL                      0.001 0.001 0.001 0.001
 score SPOOFED_FREEMAIL_NO_RDNS              0.001 0.001 0.001 0.001
-score SPOOFED_FREEM_REPTO                   0.001 2.500 0.001 2.500
+score SPOOFED_FREEM_REPTO                   0.001 2.499 0.001 2.499
 score SPOOFED_FREEM_REPTO_CHN               0.001 1.000 0.001 1.000
 score SPOOFED_FREEM_REPTO_RUS               0.001 1.000 0.001 1.000
-score SPOOF_GMAIL_MID                       0.896 1.499 0.896 1.499
-score STATIC_XPRIO_OLE                      0.937 0.001 0.937 0.001
+score SPOOF_GMAIL_MID                       1.189 1.499 1.189 1.499
+score STATIC_XPRIO_OLE                      1.252 0.001 1.252 0.001
 score STOCK_TIP                             1.000 1.000 1.000 1.000
 score SUBJ_ATTENTION                        0.499 0.001 0.499 0.001
 score SUBJ_BRKN_WORDNUMS                    1.000 1.000 1.000 1.000
-score SUBJ_LACKS_WORDS                      2.499 1.985 2.499 1.985
+score SUBJ_LACKS_WORDS                      2.102 1.942 2.102 1.942
 score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
-score SUSP_UTF8_WORD_COMBO                  0.986 0.174 0.986 0.174
-score SUSP_UTF8_WORD_FROM                   1.999 1.999 1.999 1.999
-score SUSP_UTF8_WORD_SUBJ                   1.919 1.999 1.919 1.999
+score SUSP_UTF8_WORD_COMBO                  1.392 0.025 1.392 0.025
+score SUSP_UTF8_WORD_FROM                   1.999 2.000 1.999 2.000
+score SUSP_UTF8_WORD_SUBJ                   1.999 1.999 1.999 1.999
 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.799 2.199 1.799 2.199
-score THIS_IS_ADV_SUSP_NTLD                 0.512 1.499 0.512 1.499
+score THIS_IS_ADV_SUSP_NTLD                 1.012 0.171 1.012 0.171
 score TONLINE_FAKE_DKIM                     1.000 1.000 1.000 1.000
 score TO_EQ_FM_DIRECT_MX                    0.001 0.001 0.001 0.001
-score TO_EQ_FM_DOM_HTML_IMG                 2.328 2.199 2.328 2.199
+score TO_EQ_FM_DOM_HTML_IMG                 1.795 2.199 1.795 2.199
+score TO_EQ_FM_DOM_HTML_ONLY                0.001 0.001 0.001 0.001
 score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
 score TO_EQ_FM_SPF_FAIL                     0.001 0.001 0.001 0.001
-score TO_IN_SUBJ                            0.099 0.001 0.099 0.001
-score TO_NAME_SUBJ_NO_RDNS                  2.537 0.861 2.537 0.861
-score TO_NO_BRKTS_FROM_MSSP                 2.499 0.952 2.499 0.952
-score TO_NO_BRKTS_HTML_IMG                  1.948 1.999 1.948 1.999
+score TO_IN_SUBJ                            0.100 0.001 0.100 0.001
+score TO_NAME_SUBJ_NO_RDNS                  2.964 0.841 2.964 0.841
+score TO_NO_BRKTS_FROM_MSSP                 2.499 0.979 2.499 0.979
+score TO_NO_BRKTS_HTML_IMG                  1.552 1.999 1.552 1.999
 score TO_NO_BRKTS_HTML_ONLY                 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_MSFT                      2.480 0.745 2.480 0.745
+score TO_NO_BRKTS_MSFT                      1.499 0.664 1.499 0.664
 score TO_NO_BRKTS_NORDNS_HTML               1.999 0.001 1.999 0.001
-score TO_NO_BRKTS_PCNT                      2.499 2.499 2.499 2.499
-score TVD_RCVD_SPACE_BRACKET                2.499 2.206 2.499 2.206
+score TO_NO_BRKTS_PCNT                      2.500 2.499 2.500 2.499
+score TVD_RCVD_SPACE_BRACKET                2.499 2.299 2.499 2.299
 score TVD_SPACE_ENCODED                     2.499 2.499 2.499 2.499
-score TVD_SPACE_RATIO_MINFP                 2.248 0.001 2.248 0.001
+score TVD_SPACE_RATIO_MINFP                 2.103 0.001 2.103 0.001
 score TW_GIBBERISH_MANY                     1.000 1.000 1.000 1.000
 score UC_GIBBERISH_OBFU                     1.000 1.000 1.000 1.000
-score UNDISC_FREEM                          2.899 1.443 2.899 1.443
-score UNDISC_MONEY                          2.587 2.007 2.587 2.007
+score UNDISC_FREEM                          2.899 1.321 2.899 1.321
+score UNDISC_MONEY                          1.591 1.928 1.591 1.928
 score UNICODE_OBFU_ASC                      2.499 2.499 2.499 2.499
 score UNICODE_OBFU_ZW                       1.000 1.000 1.000 1.000
 score UNICODE_OBFU_ZW_MANY                  0.001 0.001 0.001 0.001
 score UNSUB_GOOG_FORM                       1.000 1.000 1.000 1.000
-score URIBL_CT_SURBL                        0.001 1.077 0.001 1.077
+score URIBL_CT_SURBL                        0.001 1.254 0.001 1.254
 score URIBL_DM_SURBL                        0.001 0.001 0.001 0.001
 score URI_ADOBESPARK                        1.000 1.000 1.000 1.000
 score URI_AZURE_CLOUDAPP                    1.000 1.000 1.000 1.000
-score URI_BUFFLY                            1.999 2.000 1.999 2.000
-score URI_CLOUDFLAREIPFS                    0.321 0.001 0.321 0.001
+score URI_BUFFLY                            1.999 1.999 1.999 1.999
+score URI_CLOUDFLAREIPFS                    0.054 0.001 0.054 0.001
 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 1.999 1.999 1.999
 score URI_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
-score URI_DWEBIPFS                          3.499 1.553 3.499 1.553
+score URI_DWEBIPFS                          2.300 1.549 2.300 1.549
 score URI_FIREBASEAPP                       1.000 1.000 1.000 1.000
 score URI_GOOGDRAWPREVIEW                   1.000 1.000 1.000 1.000
-score URI_GOOGDRAWPREVIEW_MINFP             3.499 3.500 3.499 3.500
-score URI_GOOGLE_PROXY                      0.502 1.179 0.502 1.179
-score URI_GOOG_STO_SPAMMY                   2.999 2.915 2.999 2.915
-score URI_GOOG_STO_SUBD_SPAMMY              2.971 1.000 2.971 1.000
+score URI_GOOGDRAWPREVIEW_MINFP             3.499 3.499 3.499 3.499
+score URI_GOOGLE_PROXY                      0.501 1.179 0.501 1.179
+score URI_GOOG_STO_SPAMMY                   2.999 2.923 2.999 2.923
+score URI_GOOG_STO_SUBD_SPAMMY              2.999 1.000 2.999 1.000
 score URI_HEX_IP                            1.000 1.000 1.000 1.000
-score URI_IMG_CWINDOWSNET                   1.341 0.202 1.341 0.202
+score URI_IMG_CWINDOWSNET                   1.551 0.206 1.551 0.206
 score URI_IMG_WP_REDIR                      1.000 1.000 1.000 1.000
 score URI_INFURAIPFSIO                      1.000 0.001 1.000 0.001
 score URI_IPFSIO                            3.499 3.499 3.499 3.499
 score URI_LONG_REPEAT                       1.000 1.000 1.000 1.000
 score URI_MALWARE_BH                        0.999 0.001 0.999 0.001
-score URI_ONLY_MSGID_MALF                   0.016 1.999 0.016 1.999
-score URI_OPTOUT_3LD                        1.927 1.999 1.927 1.999
-score URI_PHISH                             3.297 1.406 3.297 1.406
+score URI_ONLY_MSGID_MALF                   0.001 1.999 0.001 1.999
+score URI_OPTOUT_3LD                        1.917 1.999 1.917 1.999
+score URI_PHISH                             3.536 1.377 3.536 1.377
 score URI_PHP_REDIR                         1.000 1.000 1.000 1.000
 score URI_TRY_3LD                           1.999 1.999 1.999 1.999
 score URI_TRY_USME                          1.000 1.000 1.000 1.000
 score URI_WPADMIN                           2.199 2.399 2.199 2.399
 score URI_WP_DIRINDEX                       1.000 1.000 1.000 1.000
 score URI_WP_HACKED                         3.499 3.499 3.499 3.499
-score URI_WP_HACKED_2                       2.401 1.561 2.401 1.561
+score URI_WP_HACKED_2                       2.401 1.698 2.401 1.698
 score USB_DRIVES                            1.000 1.000 1.000 1.000
-score VFY_ACCT_NORDNS                       2.500 2.999 2.500 2.999
-score VISTA_COST                            1.848 0.001 1.848 0.001
+score VFY_ACCT_NORDNS                       2.503 2.999 2.503 2.999
+score VISTA_COST                            2.499 0.001 2.499 0.001
 score VISTA_TONOM_EQ_TOLOC                  2.499 2.252 2.499 2.252
 score VPS_NO_NTLD                           1.000 1.000 1.000 1.000
 score WALMART_IMG_NOT_RCVD_WAL              1.000 1.000 1.000 1.000
 score WORD_INVIS                            1.000 1.000 1.000 1.000
-score WORD_INVIS_MANY                       0.897 2.651 0.897 2.651
+score WORD_INVIS_MANY                       0.906 2.649 0.906 2.649
 score XFER_LOTSA_MONEY                      0.001 0.001 0.001 0.001
 score XM_DIGITS_ONLY                        1.000 1.000 1.000 1.000
 score XM_RANDOM                             2.499 2.499 2.499 2.499
 score XPRIO                                 0.001 0.001 0.001 0.001
 score XPRIO_SHORT_SUBJ                      1.000 1.000 1.000 1.000
-score XPRIO_VISTA                           0.610 0.239 0.610 0.239
+score XPRIO_VISTA                           1.948 1.399 1.948 1.399

diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index 6978163..087d885 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0

@@ -1,56 +1,55 @@
-# Using score set 0 logs for revision 1921094 from:
-# ham-ena-week0.r1921094.log ham-ena-week1.r1921094.log ham-ena-week2.r1921094.log ham-ena-week3.r1921094.log ham-ena-week4.r1921094.log ham-giovanni-ham.r1921094.log ham-giovanni-spammy.r1921094.log ham-giovanni-spam.r1921094.log ham-grenier.r1921094.log ham-jhardin.r1921094.log ham-llanga.r1921094.log ham-mmiroslaw-mails-ham.r1921094.log ham-mmiroslaw-mails-spam.r1921094.log ham-spamsponge.r1921094.log ham-tsz-corpus.r1921094.log ham-whyscream.r1921094.log spam-ena-week0.r1921094.log spam-ena-week1.r1921094.log spam-ena-week2.r1921094.log spam-ena-week3.r1921094.log spam-ena-week4.r1921094.log spam-giovanni-ham.r1921094.log spam-giovanni-spammy.r1921094.log spam-giovanni-spam.r1921094.log spam-grenier.r1921094.log spam-jhardin.r1921094.log spam-llanga.r1921094.log spam-mmiroslaw-mails-ham.r1921094.log spam-mmiroslaw-mails-spam.r1921094.log spam-spamsponge.r1921094.log spam-tsz-corpus.r1921094.log spam-whyscream.r1921094.log
+# Using score set 0 logs for revision 1921104 from:
+# ham-ena-week0.r1921104.log ham-ena-week1.r1921104.log ham-ena-week2.r1921104.log ham-ena-week3.r1921104.log ham-ena-week4.r1921104.log ham-giovanni-ham.r1921104.log ham-giovanni-spammy.r1921104.log ham-giovanni-spam.r1921104.log ham-grenier.r1921104.log ham-jhardin.r1921104.log ham-llanga.r1921104.log ham-mmiroslaw-mails-ham.r1921104.log ham-mmiroslaw-mails-spam.r1921104.log ham-spamsponge.r1921104.log ham-tsz-corpus.r1921104.log ham-whyscream.r1921104.log spam-ena-week0.r1921104.log spam-ena-week1.r1921104.log spam-ena-week2.r1921104.log spam-ena-week3.r1921104.log spam-ena-week4.r1921104.log spam-giovanni-ham.r1921104.log spam-giovanni-spammy.r1921104.log spam-giovanni-spam.r1921104.log spam-grenier.r1921104.log spam-jhardin.r1921104.log spam-llanga.r1921104.log spam-mmiroslaw-mails-ham.r1921104.log spam-mmiroslaw-mails-spam.r1921104.log spam-spamsponge.r1921104.log spam-tsz-corpus.r1921104.log spam-whyscream.r1921104.log
 
 score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001 # force non-zero
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.499
 score AC_HTML_NONSENSE_TAGS          1.999
-score AC_POST_EXTRAS                 0.001
-score ADMITS_SPAM                    1.786
-score ADVANCE_FEE_2_NEW_FORM         1.999
+score ADMITS_SPAM                    2.182
+score ADVANCE_FEE_2_NEW_FORM         2.000
 score ADVANCE_FEE_2_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_2_NEW_MONEY        1.677
-score ADVANCE_FEE_3_NEW              3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.789
-score ADVANCE_FEE_3_NEW_MONEY        1.632
-score ADVANCE_FEE_4_NEW              3.199
+score ADVANCE_FEE_2_NEW_MONEY        1.397
+score ADVANCE_FEE_3_NEW              3.450
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.498
+score ADVANCE_FEE_3_NEW_MONEY        2.899
+score ADVANCE_FEE_4_NEW              2.250
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_4_NEW_MONEY        0.001
-score ADVANCE_FEE_5_NEW              2.499
-score ADVANCE_FEE_5_NEW_FRM_MNY      0.001 # force non-zero
-score ADVANCE_FEE_5_NEW_MONEY        1.381
-score AD_PREFS                       0.499
+score ADVANCE_FEE_5_NEW              2.485
+score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
+score ADVANCE_FEE_5_NEW_MONEY        0.001
+score AD_PREFS                       0.500
 score AMAZON_IMG_NOT_RCVD_AMZN       2.499
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.658
-score BIGNUM_EMAILS_FREEM            0.806
-score BIGNUM_EMAILS_MANY             2.999
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.001 # force non-zero
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.673
+score BIGNUM_EMAILS_FREEM            0.001
+score BIGNUM_EMAILS_MANY             3.000
 score BITCOIN_DEADLINE               2.999
-score BITCOIN_EXTORT_01              3.001
+score BITCOIN_EXTORT_01              4.248
+score BITCOIN_MALF_HTML              0.001
 score BITCOIN_MALWARE                0.001
-score BITCOIN_PAY_ME                 2.361
-score BITCOIN_SPAM_02                1.900
+score BITCOIN_SPAM_02                2.152
 score BITCOIN_SPAM_03                2.499
-score BITCOIN_SPAM_07                1.620
+score BITCOIN_SPAM_07                0.815
 score BITCOIN_SPAM_09                1.499
-score BITCOIN_TOEQFM                 2.630
+score BITCOIN_TOEQFM                 3.059
 score BITCOIN_VISTA                  0.001
 score BITCOIN_XPRIO                  2.499
-score BITCOIN_YOUR_INFO              0.361
+score BITCOIN_YOUR_INFO              0.399
 score BODY_EMAIL_419_FRAUD_GM        2.499
-score BODY_URI_ONLY                  2.247
+score BODY_URI_ONLY                  1.857
 score BOGUS_MIME_VERSION             3.499
-score CANT_SEE_AD                    1.257
-score CN_B2B_SPAMMER                 2.399
-score COMPENSATION                   1.499
+score CANT_SEE_AD                    1.492
+score CN_B2B_SPAMMER                 2.299
+score COMPENSATION                   1.500
 score CONTENT_AFTER_HTML_WEAK        1.499
 score CTE_8BIT_MISMATCH              0.999
 score DEAR_BENEFICIARY               0.001
-score DEAR_NOBODY                    3.199
+score DEAR_NOBODY                    2.848
 score DOS_BODY_HIGH_NO_MID           3.699
-score DSN_NO_MIMEVERSION             2.000
-score DUP_SUSP_HDR                   1.823
+score DSN_NO_MIMEVERSION             1.999
+score DUP_SUSP_HDR                   0.594
 score DYNAMIC_IMGUR                  0.001
 score ENCRYPTED_MESSAGE              -0.999
 score END_FUTURE_EMAILS              2.499
@@ -58,192 +57,196 @@
 score FBI_MONEY                      0.001
 score FBI_SPOOF                      0.001
 score FILL_THIS_FORM                 1.699
-score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               2.499
-score FONT_INVIS_NORDNS              0.004
-score FONT_INVIS_POSTEXTRAS          2.652
+score FONT_INVIS_LONG_LINE           3.000
+score FONT_INVIS_MSGID               2.500
+score FONT_INVIS_NORDNS              0.001
+score FONT_INVIS_POSTEXTRAS          2.286
 score FORM_FRAUD                     0.999
 score FORM_FRAUD_3                   0.001
-score FORM_FRAUD_5                   0.001
+score FORM_FRAUD_5                   0.001 # force non-zero
 score FREEMAIL_FORGED_FROMDOMAIN     0.250
 score FROM_ADDR_WS                   2.999
-score FROM_IN_TO_AND_SUBJ            1.499
+score FROM_IN_TO_AND_SUBJ            1.399
 score FROM_LONG_DOM                  1.499
-score FROM_LONG_DOM_MINFP            2.499
+score FROM_LONG_DOM_MINFP            2.500
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               0.001
+score FROM_MISSP_DYNIP               0.001 # force non-zero
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            2.147
+score FROM_MISSP_FREEMAIL            1.747
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_PHISH               3.499
-score FROM_MISSP_REPLYTO             2.499
-score FROM_MISSP_TO_UNDISC           0.697
-score FROM_MISSP_USER                0.001 # force non-zero
-score FROM_NTLD_LINKBAIT             0.001
-score FROM_NTLD_REPLY_FREEMAIL       1.885
-score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_MISSP_REPLYTO             2.098
+score FROM_MISSP_TO_UNDISC           0.733
+score FROM_MISSP_USER                0.001
+score FROM_NTLD_LINKBAIT             1.035
+score FROM_NTLD_REPLY_FREEMAIL       1.422
+score FROM_SUSPICIOUS_NTLD           0.500
 score FROM_SUSPICIOUS_NTLD_FP        1.786
-score FROM_UNBAL1                    2.600
+score FROM_UNBAL1                    2.599
 score FROM_UNBAL2                    2.599
 score FROM_WSP_TRAIL                 2.599
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HAS_TINYURL                3.399
-score FSL_HELO_BARE_IP_2             2.502
+score FSL_HAS_TINYURL                3.187
+score FSL_HELO_BARE_IP_2             2.249
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   3.100
-score FUZZY_APPLE                    3.121
-score FUZZY_BITCOIN                  2.499
+score FUZZY_AMAZON                   3.099
+score FUZZY_APPLE                    2.957
+score FUZZY_BITCOIN                  2.219
 score FUZZY_IMPORTANT                2.699
-score FUZZY_TRUMP                    1.714
-score FUZZY_TRUSTWALLET              2.199
+score FUZZY_TRUMP                    3.299
 score FUZZY_WALLET                   0.001
 score GAPPY_HTML                     3.099
-score GB_CUSTOM_HTM_URI              1.432
-score GB_FAKE_RF_SHORT               0.414
-score GB_FREEMAIL_DISPTO             0.001 # force non-zero
+score GB_CUSTOM_HTM_URI              1.499
+score GB_FAKE_RF_SHORT               0.392
+score GB_FREEMAIL_DISPTO             0.001
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
 score GOOG_STO_IMG_NOHTML            2.499
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_NO_RELAY                 1.265
+score HAS_X_NO_RELAY                 1.488
 score HDRS_MISSP                     0.001
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
-score HDR_ORDER_FTSDMCXX_NORDNS      0.001
+score HDR_ORDER_FTSDMCXX_NORDNS      0.001 # force non-zero
 score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.999
 score HK_NAME_FM_MR_MRS              1.499
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.999
-score HK_RANDOM_FROM                 1.000
-score HK_RANDOM_REPLYTO              1.000
+score HK_RANDOM_FROM                 0.999
+score HK_RANDOM_REPLYTO              0.999
 score HK_SCAM                        1.999
 score HK_WIN                         0.999
-score HOSTED_IMG_DIRECT_MX           3.499
+score HOSTED_IMG_DIRECT_MX           1.750
 score HOSTED_IMG_FREEM               3.499
-score HOSTED_IMG_MULTI_PUB_01        1.837
+score HOSTED_IMG_MULTI_PUB_01        1.836
 score HREF_EMPTY_NORDNS              0.001
+score HREF_EMPTY_XANTIABUSE          2.482
+score HREF_EMPTY_XAUTHED             2.317
 score HTML_BADATTR                   0.999
-score HTML_ENTITY_ASCII              3.000
-score HTML_ENTITY_ASCII_TINY         2.391
-score HTML_SINGLET_MANY              1.988
+score HTML_ENTITY_ASCII              2.999
+score HTML_ENTITY_ASCII_TINY         2.650
+score HTML_SINGLET_MANY              1.817
 score HTML_TEXT_INVISIBLE_FONT       0.001
-score HTML_TEXT_INVISIBLE_STYLE      0.267
-score KHOP_FAKE_EBAY                 0.999
-score LONG_HEX_URI                   3.000
+score HTML_TEXT_INVISIBLE_STYLE      0.251
+score IMG_ONLY_FM_DOM_INFO           2.100
+score KHOP_HELO_FCRDNS               0.400
+score LONG_HEX_URI                   2.653
 score LONG_IMG_URI                   0.001
-score LONG_INVISIBLE_TEXT            2.499
+score LONG_INVISIBLE_TEXT            2.003
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.499
+score LOTTO_AGENT                    0.001
 score LOTTO_DEPT                     1.999
-score MALFORMED_FREEMAIL             2.569
+score MALFORMED_FREEMAIL             2.398
 score MALWARE_NORDNS                 0.001
 score MALWARE_PASSWORD               0.001
 score MALW_ATTACH                    2.299
-score MANY_SPAN_IN_TEXT              1.864
+score MANY_SPAN_IN_TEXT              1.626
 score MANY_SUBDOM                    3.299
-score MAY_BE_FORGED                  2.245
-score MILLION_EUR                    2.356
+score MAY_BE_FORGED                  2.264
+score MILLION_EUR                    1.348
 score MILLION_HUNDRED                0.001
 score MIMEOLE_DIRECT_TO_MX           0.001
 score MIME_NO_TEXT                   1.999
-score MIXED_CENTER_CASE              2.499
+score MIXED_CENTER_CASE              2.500
 score MIXED_CTYPE_CASE               2.499
 score MIXED_ES                       2.699
-score MIXED_HREF_CASE                1.937
+score MIXED_HREF_CASE                1.803
 score MONEY_FORM_SHORT               0.001
 score MONEY_FRAUD_3                  0.001
-score MONEY_FRAUD_5                  0.001 # force non-zero
+score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.855
-score MONEY_FROM_41                  1.685
+score MONEY_FREEMAIL_REPTO           2.144
+score MONEY_FROM_41                  1.394
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.885
+score MONEY_NOHTML                   2.499
 score MSM_PRIO_REPTO                 2.499
 score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -0.080
-score NORDNS_LOW_CONTRAST            1.787
+score NICE_REPLY_A                   -3.560
+score NORDNS_LOW_CONTRAST            1.786
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score OBFU_BITCOIN                   0.728
+score OBFU_BITCOIN                   0.969
 score ODD_FREEM_REPTO                2.999
 score PDS_BAD_THREAD_QP_64           0.999
-score PDS_BTC_ID                     0.500
+score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.999
 score PDS_CPANEL_PORT_SPOOFEDURL     0.499
-score PDS_DBL_URL_LINKBAIT           1.185
+score PDS_DBL_URL_LINKBAIT           1.176
 score PDS_OTHER_BAD_TLD              1.999
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_URISHRT_LOCALPART_SUBJ     0.999
+score PDS_URISHRT_LOCALPART_SUBJ     0.001
 score PHISH_ATTACH                   2.399
-score PHP_ORIG_SCRIPT                1.305
+score PHP_ORIG_SCRIPT                1.296
 score PHP_SCRIPT                     2.499
-score PP_MIME_FAKE_ASCII_TEXT        1.000
-score RATWARE_NO_RDNS                0.290
-score REPTO_419_FRAUD                3.000
-score REPTO_419_FRAUD_GM             2.802
+score PP_MIME_FAKE_ASCII_TEXT        0.999
+score RATWARE_NO_RDNS                2.728
+score REPTO_419_FRAUD                2.838
+score REPTO_419_FRAUD_GM             2.403
 score REPTO_419_FRAUD_GM_LOOSE       0.999
-score REPTO_419_FRAUD_HM             3.000
+score REPTO_419_FRAUD_HM             2.999
 score RISK_FREE                      2.599
 score SCC_BOGUS_CTE_1                0.001
-score SCC_CANSPAM_2                  4.270
+score SCC_CANSPAM_2                  4.282
 score SCC_ISEMM_LID_1B               1.499
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
-score SHORTENER_SHORT_IMG            0.188
-score SHORT_IMG_SUSP_NTLD            0.686
+score SHORTENER_SHORT_IMG            2.499
+score SHORT_IMG_SUSP_NTLD            1.223
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
-score SPOOF_GMAIL_MID                0.896
-score STATIC_XPRIO_OLE               0.937
+score SPOOF_GMAIL_MID                1.189
+score STATIC_XPRIO_OLE               1.252
 score SUBJ_ATTENTION                 0.499
-score SUBJ_LACKS_WORDS               2.499
-score SUSP_UTF8_WORD_COMBO           0.986
+score SUBJ_LACKS_WORDS               2.102
+score SUSP_UTF8_WORD_COMBO           1.392
 score SUSP_UTF8_WORD_FROM            1.999
-score SUSP_UTF8_WORD_SUBJ            1.919
+score SUSP_UTF8_WORD_SUBJ            1.999
 score THIS_AD                        1.799
-score THIS_IS_ADV_SUSP_NTLD          0.512
+score THIS_IS_ADV_SUSP_NTLD          1.012
 score TO_EQ_FM_DIRECT_MX             0.001
-score TO_EQ_FM_DOM_HTML_IMG          2.328
-score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           2.537
+score TO_EQ_FM_DOM_HTML_IMG          1.795
+score TO_EQ_FM_DOM_HTML_ONLY         0.001
+score TO_IN_SUBJ                     0.100
+score TO_NAME_SUBJ_NO_RDNS           2.964
 score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.948
+score TO_NO_BRKTS_HTML_IMG           1.552
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               2.480
+score TO_NO_BRKTS_MSFT               1.499
 score TO_NO_BRKTS_NORDNS_HTML        1.999
-score TO_NO_BRKTS_PCNT               2.499
+score TO_NO_BRKTS_PCNT               2.500
 score TVD_RCVD_SPACE_BRACKET         2.499
 score TVD_SPACE_ENCODED              2.499
-score TVD_SPACE_RATIO_MINFP          2.248
+score TVD_SPACE_RATIO_MINFP          2.103
 score UNDISC_FREEM                   2.899
-score UNDISC_MONEY                   2.587
+score UNDISC_MONEY                   1.591
 score UNICODE_OBFU_ASC               2.499
-score UNICODE_OBFU_ZW_MANY           0.001
+score UNICODE_OBFU_ZW_MANY           0.001 # force non-zero
 score URI_BUFFLY                     1.999
-score URI_CLOUDFLAREIPFS             0.321
+score URI_CLOUDFLAREIPFS             0.054
 score URI_DOTEDU                     1.999
-score URI_DWEBIPFS                   3.499
+score URI_DWEBIPFS                   2.300
 score URI_GOOGDRAWPREVIEW_MINFP      3.499
-score URI_GOOGLE_PROXY               0.502
+score URI_GOOGLE_PROXY               0.501
 score URI_GOOG_STO_SPAMMY            2.999
-score URI_GOOG_STO_SUBD_SPAMMY       2.971
-score URI_IMG_CWINDOWSNET            1.341
+score URI_GOOG_STO_SUBD_SPAMMY       2.999
+score URI_IMG_CWINDOWSNET            1.551
 score URI_IPFSIO                     3.499
 score URI_MALWARE_BH                 0.999
-score URI_ONLY_MSGID_MALF            0.016
-score URI_OPTOUT_3LD                 1.927
-score URI_PHISH                      3.297
+score URI_ONLY_MSGID_MALF            0.001
+score URI_OPTOUT_3LD                 1.917
+score URI_PHISH                      3.536
 score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.199
 score URI_WP_HACKED                  3.499
 score URI_WP_HACKED_2                2.401
-score VFY_ACCT_NORDNS                2.500
-score VISTA_COST                     1.848
+score VFY_ACCT_NORDNS                2.503
+score VISTA_COST                     2.499
 score VISTA_TONOM_EQ_TOLOC           2.499
-score WORD_INVIS_MANY                0.897
+score WORD_INVIS_MANY                0.906
 score XFER_LOTSA_MONEY               0.001
 score XM_RANDOM                      2.499
 score XPRIO                          0.001
-score XPRIO_VISTA                    0.610
+score XPRIO_VISTA                    1.948
+score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000
@@ -263,6 +266,7 @@
 score BITCOIN_IMGUR                  1.000
 score BITCOIN_OBFU_SUBJ              1.000
 score BITCOIN_ONAN                   1.000
+score BITCOIN_PAY_ME                 1.000
 score BITCOIN_SPAM_01                1.000
 score BITCOIN_SPAM_04                1.000
 score BITCOIN_SPAM_06                1.000
@@ -301,17 +305,15 @@
 score GOOG_STO_HTML_PHISH_MANY       1.000
 score GOOG_STO_IMG_HTML              1.000
 score HAS_X_OUTGOING_SPAM_STAT       1.000
+score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
 score HOSTED_IMG_DQ_UNSUB            1.000
 score HOSTED_IMG_MULTI               1.000
 score HREF_EMPTY_PHPMAIL             1.000
-score HREF_EMPTY_XANTIABUSE          1.000
-score HREF_EMPTY_XAUTHED             1.000
 score HTML_OFF_PAGE                  1.000
 score HTML_SHRT_CMNT_OBFU_MANY       1.000
-score IMG_ONLY_FM_DOM_INFO           1.000
 score JH_SPAMMY_HEADERS              1.000
 score JH_SPAMMY_PATTERN01            1.000
 score JH_SPAMMY_PATTERN02            1.000

diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index c8a104c..2e608e8 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1

@@ -1,61 +1,61 @@
 # Using score set 1 logs for revision 1921005 from:
 # ham-net-ena-week0.r1921005.log ham-net-ena-week1.r1921005.log ham-net-ena-week4.r1921005.log ham-net-giovanni-ham.r1921005.log ham-net-giovanni-spammy.r1921005.log ham-net-giovanni-spam.r1921005.log ham-net-grenier.r1921005.log ham-net-jhardin.r1921005.log ham-net-llanga.r1921005.log ham-net-mmiroslaw-mails-ham.r1921005.log ham-net-mmiroslaw-mails-spam.r1921005.log ham-net-spamsponge.r1921005.log ham-net-tsz-corpus.r1921005.log ham-net-whyscream.r1921005.log spam-net-ena-week0.r1921005.log spam-net-ena-week1.r1921005.log spam-net-ena-week4.r1921005.log spam-net-giovanni-ham.r1921005.log spam-net-giovanni-spammy.r1921005.log spam-net-giovanni-spam.r1921005.log spam-net-grenier.r1921005.log spam-net-jhardin.r1921005.log spam-net-llanga.r1921005.log spam-net-mmiroslaw-mails-ham.r1921005.log spam-net-mmiroslaw-mails-spam.r1921005.log spam-net-spamsponge.r1921005.log spam-net-tsz-corpus.r1921005.log spam-net-whyscream.r1921005.log
 
-score ACCT_PHISHING_MANY             3.000
+score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001 # force non-zero
 score AC_DIV_BONANZA                 0.001
-score AC_FROM_MANY_DOTS              2.500
+score AC_FROM_MANY_DOTS              2.499
 score AC_HTML_NONSENSE_TAGS          1.999
-score AC_POST_EXTRAS                 0.793
-score ADMITS_SPAM                    1.920
-score ADVANCE_FEE_2_NEW_FORM         1.139
-score ADVANCE_FEE_2_NEW_FRM_MNY      0.783
-score ADVANCE_FEE_2_NEW_MONEY        2.000
+score AC_POST_EXTRAS                 0.685
+score ADMITS_SPAM                    1.815
+score ADVANCE_FEE_2_NEW_FORM         1.146
+score ADVANCE_FEE_2_NEW_FRM_MNY      1.519
+score ADVANCE_FEE_2_NEW_MONEY        1.999
 score ADVANCE_FEE_3_NEW              0.001
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.924
-score ADVANCE_FEE_3_NEW_MONEY        1.232
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.502
+score ADVANCE_FEE_3_NEW_MONEY        1.237
 score ADVANCE_FEE_4_NEW              0.001
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW              0.001
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_5_NEW_MONEY        0.001
-score AMAZON_IMG_NOT_RCVD_AMZN       0.807
+score AMAZON_IMG_NOT_RCVD_AMZN       0.802
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
 score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.001
 score BIGNUM_EMAILS_FREEM            0.001
 score BIGNUM_EMAILS_MANY             2.999
-score BITCOIN_DEADLINE               3.000
-score BITCOIN_EXTORT_01              3.000
+score BITCOIN_DEADLINE               2.999
+score BITCOIN_EXTORT_01              2.999
 score BITCOIN_MALWARE                0.001
 score BITCOIN_PAY_ME                 2.999
-score BITCOIN_SPAM_02                2.499
+score BITCOIN_SPAM_02                2.423
 score BITCOIN_SPAM_03                2.499
 score BITCOIN_SPAM_05                2.499
 score BITCOIN_SPAM_07                0.001
 score BITCOIN_SPAM_09                1.499
-score BITCOIN_TOEQFM                 1.423
+score BITCOIN_TOEQFM                 1.418
 score BITCOIN_VISTA                  0.001
 score BITCOIN_XPRIO                  0.001
-score BITCOIN_YOUR_INFO              0.301
-score BODY_URI_ONLY                  0.925
+score BITCOIN_YOUR_INFO              0.966
+score BODY_URI_ONLY                  0.926
 score BOGUS_MIME_VERSION             3.499
-score CN_B2B_SPAMMER                 2.299
-score COMPENSATION                   1.444
+score CN_B2B_SPAMMER                 2.300
+score COMPENSATION                   1.219
 score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              0.257
+score CTE_8BIT_MISMATCH              0.258
 score DEAR_BENEFICIARY               0.001
-score DEAR_NOBODY                    2.425
-score DKIMWL_BL                      2.431
-score DKIMWL_WL_HIGH                 -0.146
-score DKIMWL_WL_MED                  -0.001 # force non-zero
+score DEAR_NOBODY                    2.419
+score DKIMWL_BL                      0.172
+score DKIMWL_WL_HIGH                 -0.144
+score DKIMWL_WL_MED                  -0.001
 score DKIMWL_WL_MEDHI                -0.001
-score DOS_BODY_HIGH_NO_MID           3.269
+score DOS_BODY_HIGH_NO_MID           3.274
 score DSN_NO_MIMEVERSION             1.999
-score DUP_SUSP_HDR                   1.130
+score DUP_SUSP_HDR                   0.403
 score DYNAMIC_IMGUR                  0.001
-score ENCRYPTED_MESSAGE              -0.999
-score END_FUTURE_EMAILS              1.933
+score ENCRYPTED_MESSAGE              -1.000
+score END_FUTURE_EMAILS              1.832
 score FACEBOOK_IMG_NOT_RCVD_FB       1.999
 score FBI_MONEY                      0.001
 score FBI_SPOOF                      0.001
@@ -63,129 +63,129 @@
 score FONT_INVIS_LONG_LINE           2.999
 score FONT_INVIS_MSGID               2.499
 score FONT_INVIS_NORDNS              0.001
-score FONT_INVIS_POSTEXTRAS          1.509
-score FORGED_SPF_HELO                1.868
+score FONT_INVIS_POSTEXTRAS          1.610
+score FORGED_SPF_HELO                1.866
 score FORM_FRAUD                     0.999
 score FORM_FRAUD_3                   2.799
 score FORM_FRAUD_5                   0.001
 score FOUND_YOU                      0.001
-score FREEMAIL_FORGED_FROMDOMAIN     0.001
-score FROM_ADDR_WS                   2.151
-score FROM_BANK_NOAUTH               0.999
+score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
+score FROM_ADDR_WS                   2.145
+score FROM_BANK_NOAUTH               1.000
 score FROM_FMBLA_NEWDOM              1.499
-score FROM_FMBLA_NEWDOM14            0.005
+score FROM_FMBLA_NEWDOM14            0.007
 score FROM_FMBLA_NEWDOM28            0.799
-score FROM_GOV_DKIM_AU               -0.368
+score FROM_GOV_DKIM_AU               -0.787
 score FROM_GOV_SPOOF                 0.999
-score FROM_IN_TO_AND_SUBJ            1.300
+score FROM_IN_TO_AND_SUBJ            1.299
 score FROM_LONG_DOM                  1.499
 score FROM_LONG_DOM_MINFP            2.499
 score FROM_MISSPACED                 0.001
 score FROM_MISSP_DYNIP               0.001
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            0.817
+score FROM_MISSP_FREEMAIL            0.748
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_PHISH               3.499
-score FROM_MISSP_REPLYTO             0.892
+score FROM_MISSP_REPLYTO             0.891
 score FROM_MISSP_SPF_FAIL            0.001
-score FROM_MISSP_TO_UNDISC           1.740
+score FROM_MISSP_TO_UNDISC           1.419
 score FROM_MISSP_USER                0.001
-score FROM_NTLD_LINKBAIT             1.594
+score FROM_NTLD_LINKBAIT             0.899
 score FROM_NTLD_REPLY_FREEMAIL       0.001
 score FROM_SUSPICIOUS_NTLD           0.499
-score FROM_SUSPICIOUS_NTLD_FP        2.000
+score FROM_SUSPICIOUS_NTLD_FP        1.999
 score FROM_UNBAL1                    2.599
 score FROM_UNBAL2                    2.599
 score FROM_WSP_TRAIL                 2.399
-score FSL_BULK_SIG                   0.383
+score FSL_BULK_SIG                   0.434
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HAS_TINYURL                2.689
-score FSL_HELO_BARE_IP_2             1.162
+score FSL_HAS_TINYURL                2.700
+score FSL_HELO_BARE_IP_2             1.164
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   3.099
 score FUZZY_APPLE                    2.699
 score FUZZY_BITCOIN                  2.299
 score FUZZY_IMPORTANT                2.599
-score FUZZY_TRUMP                    3.755
+score FUZZY_TRUMP                    3.036
 score FUZZY_TRUSTWALLET              2.299
-score FUZZY_WALLET                   0.633
+score FUZZY_WALLET                   0.640
 score GB_CUSTOM_HTM_URI              1.499
 score GB_FAKE_RF_SHORT               1.257
 score GB_FREEMAIL_DISPTO             0.001
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
-score GB_HASHBL_BTC                  0.701
+score GB_HASHBL_BTC                  0.696
 score GOOG_STO_IMG_NOHTML            0.001
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_NO_RELAY                 0.401
-score HDRS_MISSP                     2.352
+score HAS_X_NO_RELAY                 1.379
+score HDRS_MISSP                     2.353
 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 HK_LOTTO                       1.000
-score HK_NAME_FM_MR_MRS              0.038
+score HK_LOTTO                       0.999
+score HK_NAME_FM_MR_MRS              0.239
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.001
 score HK_RANDOM_FROM                 0.999
 score HK_RANDOM_REPLYTO              0.999
 score HK_SCAM                        0.001
 score HK_WIN                         0.999
-score HOSTED_IMG_DIRECT_MX           2.077
+score HOSTED_IMG_DIRECT_MX           1.614
 score HOSTED_IMG_FREEM               0.001
-score HOSTED_IMG_MULTI_PUB_01        0.649
-score HREF_EMPTY_NORDNS              0.307
+score HOSTED_IMG_MULTI_PUB_01        0.648
+score HREF_EMPTY_NORDNS              0.379
 score HTML_ENTITY_ASCII              2.999
-score HTML_SINGLET_MANY              1.674
+score HTML_SINGLET_MANY              1.675
 score HTML_TEXT_INVISIBLE_FONT       0.001
-score HTML_TEXT_INVISIBLE_STYLE      2.634
-score IMG_ONLY_FM_DOM_INFO           0.782
-score LONG_HEX_URI                   1.571
-score LONG_IMG_URI                   1.399
-score LONG_INVISIBLE_TEXT            1.747
+score HTML_TEXT_INVISIBLE_STYLE      2.625
+score IMG_ONLY_FM_DOM_INFO           0.779
+score LONG_HEX_URI                   1.671
+score LONG_IMG_URI                   1.263
+score LONG_INVISIBLE_TEXT            1.750
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    0.001
 score LOTTO_DEPT                     1.999
-score MALFORMED_FREEMAIL             2.045
+score MALFORMED_FREEMAIL             2.043
 score MALWARE_NORDNS                 0.001
 score MALWARE_PASSWORD               0.001
 score MALW_ATTACH                    2.199
 score MANY_SPAN_IN_TEXT              2.299
-score MANY_SUBDOM                    3.199
+score MANY_SUBDOM                    3.164
 score MILLION_EUR                    0.001
 score MILLION_HUNDRED                0.001
 score MIMEOLE_DIRECT_TO_MX           0.001
-score MIME_NO_TEXT                   1.741
+score MIME_NO_TEXT                   1.755
 score MIXED_CENTER_CASE              2.499
 score MIXED_CTYPE_CASE               2.399
-score MIXED_ES                       2.699
-score MIXED_HREF_CASE                1.898
+score MIXED_ES                       2.700
+score MIXED_HREF_CASE                1.851
 score MONEY_FORM_SHORT               0.001
-score MONEY_FRAUD_3                  2.899
+score MONEY_FRAUD_3                  2.779
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           0.001
-score MONEY_FROM_41                  0.841
-score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.491
-score MSM_PRIO_REPTO                 2.499
-score NA_DOLLARS                     0.046
-score NICE_REPLY_A                   -1.206
-score NORDNS_LOW_CONTRAST            1.084
+score MONEY_FREEMAIL_REPTO           0.004
+score MONEY_FROM_41                  0.775
+score MONEY_FROM_MISSP               0.001 # force non-zero
+score MONEY_NOHTML                   1.570
+score MSM_PRIO_REPTO                 2.434
+score NA_DOLLARS                     0.052
+score NICE_REPLY_A                   -2.890
+score NORDNS_LOW_CONTRAST            1.064
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001 # force non-zero
-score NSL_RCVD_HELO_USER             1.724
-score OBFU_BITCOIN                   0.618
-score ODD_FREEM_REPTO                1.394
-score PDS_BTC_ID                     0.499
+score NSL_RCVD_HELO_USER             0.662
+score OBFU_BITCOIN                   0.001
+score ODD_FREEM_REPTO                1.397
+score PDS_BTC_ID                     0.500
 score PDS_BTC_MSGID                  0.001
-score PDS_HELO_SPF_FAIL              1.999
-score PDS_OTHER_BAD_TLD              2.000
+score PDS_HELO_SPF_FAIL              2.000
+score PDS_OTHER_BAD_TLD              1.999
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
 score PHISH_ATTACH                   2.299
-score PHP_ORIG_SCRIPT                1.871
-score PHP_SCRIPT                     2.499
+score PHP_ORIG_SCRIPT                1.874
+score PHP_SCRIPT                     2.500
 score PP_MIME_FAKE_ASCII_TEXT        0.261
-score RATWARE_NO_RDNS                0.427
+score RATWARE_NO_RDNS                2.859
 score RCVD_IN_IADB_COURT             -0.001
 score RCVD_IN_IADB_DMARC             -0.001
 score RCVD_IN_IADB_ESP               -0.001
@@ -193,73 +193,73 @@
 score RCVD_IN_IADB_URG               -0.001
 score RCVD_IN_MSPIKE_H2              -0.001
 score REPTO_419_FRAUD                2.999
-score REPTO_419_FRAUD_GM             1.531
-score REPTO_419_FRAUD_GM_LOOSE       0.999
-score REPTO_419_FRAUD_HM             2.513
+score REPTO_419_FRAUD_GM             1.502
+score REPTO_419_FRAUD_GM_LOOSE       1.000
+score REPTO_419_FRAUD_HM             2.509
 score RISK_FREE                      2.499
-score SCC_BOGUS_CTE_1                1.259
-score SCC_CANSPAM_2                  4.099
+score SCC_BOGUS_CTE_1                1.307
+score SCC_CANSPAM_2                  3.341
 score SCC_ISEMM_LID_1B               1.499
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
 score SHORTENER_SHORT_IMG            2.499
-score SHORT_IMG_SUSP_NTLD            1.499
-score SPOOFED_FREEMAIL               0.001 # force non-zero
+score SHORT_IMG_SUSP_NTLD            0.486
+score SPOOFED_FREEMAIL               0.001
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
-score SPOOFED_FREEM_REPTO            2.500
+score SPOOFED_FREEM_REPTO            2.499
 score SPOOF_GMAIL_MID                1.499
 score STATIC_XPRIO_OLE               0.001
 score SUBJ_ATTENTION                 0.001
-score SUBJ_LACKS_WORDS               1.985
-score SUSP_UTF8_WORD_COMBO           0.174
-score SUSP_UTF8_WORD_FROM            1.999
+score SUBJ_LACKS_WORDS               1.942
+score SUSP_UTF8_WORD_COMBO           0.025
+score SUSP_UTF8_WORD_FROM            2.000
 score SUSP_UTF8_WORD_SUBJ            1.999
 score THIS_AD                        2.199
-score THIS_IS_ADV_SUSP_NTLD          1.499
+score THIS_IS_ADV_SUSP_NTLD          0.171
 score TO_EQ_FM_DIRECT_MX             0.001
 score TO_EQ_FM_DOM_HTML_IMG          2.199
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_IN_SUBJ                     0.001 # force non-zero
-score TO_NAME_SUBJ_NO_RDNS           0.861
-score TO_NO_BRKTS_FROM_MSSP          0.952
+score TO_IN_SUBJ                     0.001
+score TO_NAME_SUBJ_NO_RDNS           0.841
+score TO_NO_BRKTS_FROM_MSSP          0.979
 score TO_NO_BRKTS_HTML_IMG           1.999
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               0.745
+score TO_NO_BRKTS_MSFT               0.664
 score TO_NO_BRKTS_NORDNS_HTML        0.001
 score TO_NO_BRKTS_PCNT               2.499
-score TVD_RCVD_SPACE_BRACKET         2.206
+score TVD_RCVD_SPACE_BRACKET         2.299
 score TVD_SPACE_ENCODED              2.499
-score TVD_SPACE_RATIO_MINFP          0.001
-score UNDISC_FREEM                   1.443
-score UNDISC_MONEY                   2.007
+score TVD_SPACE_RATIO_MINFP          0.001 # force non-zero
+score UNDISC_FREEM                   1.321
+score UNDISC_MONEY                   1.928
 score UNICODE_OBFU_ASC               2.499
 score UNICODE_OBFU_ZW_MANY           0.001
-score URIBL_CT_SURBL                 1.077
+score URIBL_CT_SURBL                 1.254
 score URIBL_DM_SURBL                 0.001
-score URI_BUFFLY                     2.000
-score URI_CLOUDFLAREIPFS             0.001 # force non-zero
+score URI_BUFFLY                     1.999
+score URI_CLOUDFLAREIPFS             0.001
 score URI_DOTEDU                     1.999
-score URI_DWEBIPFS                   1.553
-score URI_GOOGDRAWPREVIEW_MINFP      3.500
+score URI_DWEBIPFS                   1.549
+score URI_GOOGDRAWPREVIEW_MINFP      3.499
 score URI_GOOGLE_PROXY               1.179
-score URI_GOOG_STO_SPAMMY            2.915
-score URI_IMG_CWINDOWSNET            0.202
+score URI_GOOG_STO_SPAMMY            2.923
+score URI_IMG_CWINDOWSNET            0.206
 score URI_IPFSIO                     3.499
 score URI_ONLY_MSGID_MALF            1.999
 score URI_OPTOUT_3LD                 1.999
-score URI_PHISH                      1.406
+score URI_PHISH                      1.377
 score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.399
 score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                1.561
+score URI_WP_HACKED_2                1.698
 score VFY_ACCT_NORDNS                2.999
 score VISTA_COST                     0.001
 score VISTA_TONOM_EQ_TOLOC           2.252
-score WORD_INVIS_MANY                2.651
+score WORD_INVIS_MANY                2.649
 score XFER_LOTSA_MONEY               0.001
 score XM_RANDOM                      2.499
-score XPRIO                          0.001
-score XPRIO_VISTA                    0.239
+score XPRIO                          0.001 # force non-zero
+score XPRIO_VISTA                    1.399
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000

diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index 6978163..087d885 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2

@@ -1,56 +1,55 @@
-# Using score set 0 logs for revision 1921094 from:
-# ham-ena-week0.r1921094.log ham-ena-week1.r1921094.log ham-ena-week2.r1921094.log ham-ena-week3.r1921094.log ham-ena-week4.r1921094.log ham-giovanni-ham.r1921094.log ham-giovanni-spammy.r1921094.log ham-giovanni-spam.r1921094.log ham-grenier.r1921094.log ham-jhardin.r1921094.log ham-llanga.r1921094.log ham-mmiroslaw-mails-ham.r1921094.log ham-mmiroslaw-mails-spam.r1921094.log ham-spamsponge.r1921094.log ham-tsz-corpus.r1921094.log ham-whyscream.r1921094.log spam-ena-week0.r1921094.log spam-ena-week1.r1921094.log spam-ena-week2.r1921094.log spam-ena-week3.r1921094.log spam-ena-week4.r1921094.log spam-giovanni-ham.r1921094.log spam-giovanni-spammy.r1921094.log spam-giovanni-spam.r1921094.log spam-grenier.r1921094.log spam-jhardin.r1921094.log spam-llanga.r1921094.log spam-mmiroslaw-mails-ham.r1921094.log spam-mmiroslaw-mails-spam.r1921094.log spam-spamsponge.r1921094.log spam-tsz-corpus.r1921094.log spam-whyscream.r1921094.log
+# Using score set 0 logs for revision 1921104 from:
+# ham-ena-week0.r1921104.log ham-ena-week1.r1921104.log ham-ena-week2.r1921104.log ham-ena-week3.r1921104.log ham-ena-week4.r1921104.log ham-giovanni-ham.r1921104.log ham-giovanni-spammy.r1921104.log ham-giovanni-spam.r1921104.log ham-grenier.r1921104.log ham-jhardin.r1921104.log ham-llanga.r1921104.log ham-mmiroslaw-mails-ham.r1921104.log ham-mmiroslaw-mails-spam.r1921104.log ham-spamsponge.r1921104.log ham-tsz-corpus.r1921104.log ham-whyscream.r1921104.log spam-ena-week0.r1921104.log spam-ena-week1.r1921104.log spam-ena-week2.r1921104.log spam-ena-week3.r1921104.log spam-ena-week4.r1921104.log spam-giovanni-ham.r1921104.log spam-giovanni-spammy.r1921104.log spam-giovanni-spam.r1921104.log spam-grenier.r1921104.log spam-jhardin.r1921104.log spam-llanga.r1921104.log spam-mmiroslaw-mails-ham.r1921104.log spam-mmiroslaw-mails-spam.r1921104.log spam-spamsponge.r1921104.log spam-tsz-corpus.r1921104.log spam-whyscream.r1921104.log
 
 score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001 # force non-zero
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.499
 score AC_HTML_NONSENSE_TAGS          1.999
-score AC_POST_EXTRAS                 0.001
-score ADMITS_SPAM                    1.786
-score ADVANCE_FEE_2_NEW_FORM         1.999
+score ADMITS_SPAM                    2.182
+score ADVANCE_FEE_2_NEW_FORM         2.000
 score ADVANCE_FEE_2_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_2_NEW_MONEY        1.677
-score ADVANCE_FEE_3_NEW              3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.789
-score ADVANCE_FEE_3_NEW_MONEY        1.632
-score ADVANCE_FEE_4_NEW              3.199
+score ADVANCE_FEE_2_NEW_MONEY        1.397
+score ADVANCE_FEE_3_NEW              3.450
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.498
+score ADVANCE_FEE_3_NEW_MONEY        2.899
+score ADVANCE_FEE_4_NEW              2.250
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_4_NEW_MONEY        0.001
-score ADVANCE_FEE_5_NEW              2.499
-score ADVANCE_FEE_5_NEW_FRM_MNY      0.001 # force non-zero
-score ADVANCE_FEE_5_NEW_MONEY        1.381
-score AD_PREFS                       0.499
+score ADVANCE_FEE_5_NEW              2.485
+score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
+score ADVANCE_FEE_5_NEW_MONEY        0.001
+score AD_PREFS                       0.500
 score AMAZON_IMG_NOT_RCVD_AMZN       2.499
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.658
-score BIGNUM_EMAILS_FREEM            0.806
-score BIGNUM_EMAILS_MANY             2.999
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.001 # force non-zero
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.673
+score BIGNUM_EMAILS_FREEM            0.001
+score BIGNUM_EMAILS_MANY             3.000
 score BITCOIN_DEADLINE               2.999
-score BITCOIN_EXTORT_01              3.001
+score BITCOIN_EXTORT_01              4.248
+score BITCOIN_MALF_HTML              0.001
 score BITCOIN_MALWARE                0.001
-score BITCOIN_PAY_ME                 2.361
-score BITCOIN_SPAM_02                1.900
+score BITCOIN_SPAM_02                2.152
 score BITCOIN_SPAM_03                2.499
-score BITCOIN_SPAM_07                1.620
+score BITCOIN_SPAM_07                0.815
 score BITCOIN_SPAM_09                1.499
-score BITCOIN_TOEQFM                 2.630
+score BITCOIN_TOEQFM                 3.059
 score BITCOIN_VISTA                  0.001
 score BITCOIN_XPRIO                  2.499
-score BITCOIN_YOUR_INFO              0.361
+score BITCOIN_YOUR_INFO              0.399
 score BODY_EMAIL_419_FRAUD_GM        2.499
-score BODY_URI_ONLY                  2.247
+score BODY_URI_ONLY                  1.857
 score BOGUS_MIME_VERSION             3.499
-score CANT_SEE_AD                    1.257
-score CN_B2B_SPAMMER                 2.399
-score COMPENSATION                   1.499
+score CANT_SEE_AD                    1.492
+score CN_B2B_SPAMMER                 2.299
+score COMPENSATION                   1.500
 score CONTENT_AFTER_HTML_WEAK        1.499
 score CTE_8BIT_MISMATCH              0.999
 score DEAR_BENEFICIARY               0.001
-score DEAR_NOBODY                    3.199
+score DEAR_NOBODY                    2.848
 score DOS_BODY_HIGH_NO_MID           3.699
-score DSN_NO_MIMEVERSION             2.000
-score DUP_SUSP_HDR                   1.823
+score DSN_NO_MIMEVERSION             1.999
+score DUP_SUSP_HDR                   0.594
 score DYNAMIC_IMGUR                  0.001
 score ENCRYPTED_MESSAGE              -0.999
 score END_FUTURE_EMAILS              2.499
@@ -58,192 +57,196 @@
 score FBI_MONEY                      0.001
 score FBI_SPOOF                      0.001
 score FILL_THIS_FORM                 1.699
-score FONT_INVIS_LONG_LINE           2.999
-score FONT_INVIS_MSGID               2.499
-score FONT_INVIS_NORDNS              0.004
-score FONT_INVIS_POSTEXTRAS          2.652
+score FONT_INVIS_LONG_LINE           3.000
+score FONT_INVIS_MSGID               2.500
+score FONT_INVIS_NORDNS              0.001
+score FONT_INVIS_POSTEXTRAS          2.286
 score FORM_FRAUD                     0.999
 score FORM_FRAUD_3                   0.001
-score FORM_FRAUD_5                   0.001
+score FORM_FRAUD_5                   0.001 # force non-zero
 score FREEMAIL_FORGED_FROMDOMAIN     0.250
 score FROM_ADDR_WS                   2.999
-score FROM_IN_TO_AND_SUBJ            1.499
+score FROM_IN_TO_AND_SUBJ            1.399
 score FROM_LONG_DOM                  1.499
-score FROM_LONG_DOM_MINFP            2.499
+score FROM_LONG_DOM_MINFP            2.500
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               0.001
+score FROM_MISSP_DYNIP               0.001 # force non-zero
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            2.147
+score FROM_MISSP_FREEMAIL            1.747
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_PHISH               3.499
-score FROM_MISSP_REPLYTO             2.499
-score FROM_MISSP_TO_UNDISC           0.697
-score FROM_MISSP_USER                0.001 # force non-zero
-score FROM_NTLD_LINKBAIT             0.001
-score FROM_NTLD_REPLY_FREEMAIL       1.885
-score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_MISSP_REPLYTO             2.098
+score FROM_MISSP_TO_UNDISC           0.733
+score FROM_MISSP_USER                0.001
+score FROM_NTLD_LINKBAIT             1.035
+score FROM_NTLD_REPLY_FREEMAIL       1.422
+score FROM_SUSPICIOUS_NTLD           0.500
 score FROM_SUSPICIOUS_NTLD_FP        1.786
-score FROM_UNBAL1                    2.600
+score FROM_UNBAL1                    2.599
 score FROM_UNBAL2                    2.599
 score FROM_WSP_TRAIL                 2.599
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HAS_TINYURL                3.399
-score FSL_HELO_BARE_IP_2             2.502
+score FSL_HAS_TINYURL                3.187
+score FSL_HELO_BARE_IP_2             2.249
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   3.100
-score FUZZY_APPLE                    3.121
-score FUZZY_BITCOIN                  2.499
+score FUZZY_AMAZON                   3.099
+score FUZZY_APPLE                    2.957
+score FUZZY_BITCOIN                  2.219
 score FUZZY_IMPORTANT                2.699
-score FUZZY_TRUMP                    1.714
-score FUZZY_TRUSTWALLET              2.199
+score FUZZY_TRUMP                    3.299
 score FUZZY_WALLET                   0.001
 score GAPPY_HTML                     3.099
-score GB_CUSTOM_HTM_URI              1.432
-score GB_FAKE_RF_SHORT               0.414
-score GB_FREEMAIL_DISPTO             0.001 # force non-zero
+score GB_CUSTOM_HTM_URI              1.499
+score GB_FAKE_RF_SHORT               0.392
+score GB_FREEMAIL_DISPTO             0.001
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
 score GOOG_STO_IMG_NOHTML            2.499
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_NO_RELAY                 1.265
+score HAS_X_NO_RELAY                 1.488
 score HDRS_MISSP                     0.001
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
-score HDR_ORDER_FTSDMCXX_NORDNS      0.001
+score HDR_ORDER_FTSDMCXX_NORDNS      0.001 # force non-zero
 score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.999
 score HK_NAME_FM_MR_MRS              1.499
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.999
-score HK_RANDOM_FROM                 1.000
-score HK_RANDOM_REPLYTO              1.000
+score HK_RANDOM_FROM                 0.999
+score HK_RANDOM_REPLYTO              0.999
 score HK_SCAM                        1.999
 score HK_WIN                         0.999
-score HOSTED_IMG_DIRECT_MX           3.499
+score HOSTED_IMG_DIRECT_MX           1.750
 score HOSTED_IMG_FREEM               3.499
-score HOSTED_IMG_MULTI_PUB_01        1.837
+score HOSTED_IMG_MULTI_PUB_01        1.836
 score HREF_EMPTY_NORDNS              0.001
+score HREF_EMPTY_XANTIABUSE          2.482
+score HREF_EMPTY_XAUTHED             2.317
 score HTML_BADATTR                   0.999
-score HTML_ENTITY_ASCII              3.000
-score HTML_ENTITY_ASCII_TINY         2.391
-score HTML_SINGLET_MANY              1.988
+score HTML_ENTITY_ASCII              2.999
+score HTML_ENTITY_ASCII_TINY         2.650
+score HTML_SINGLET_MANY              1.817
 score HTML_TEXT_INVISIBLE_FONT       0.001
-score HTML_TEXT_INVISIBLE_STYLE      0.267
-score KHOP_FAKE_EBAY                 0.999
-score LONG_HEX_URI                   3.000
+score HTML_TEXT_INVISIBLE_STYLE      0.251
+score IMG_ONLY_FM_DOM_INFO           2.100
+score KHOP_HELO_FCRDNS               0.400
+score LONG_HEX_URI                   2.653
 score LONG_IMG_URI                   0.001
-score LONG_INVISIBLE_TEXT            2.499
+score LONG_INVISIBLE_TEXT            2.003
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.499
+score LOTTO_AGENT                    0.001
 score LOTTO_DEPT                     1.999
-score MALFORMED_FREEMAIL             2.569
+score MALFORMED_FREEMAIL             2.398
 score MALWARE_NORDNS                 0.001
 score MALWARE_PASSWORD               0.001
 score MALW_ATTACH                    2.299
-score MANY_SPAN_IN_TEXT              1.864
+score MANY_SPAN_IN_TEXT              1.626
 score MANY_SUBDOM                    3.299
-score MAY_BE_FORGED                  2.245
-score MILLION_EUR                    2.356
+score MAY_BE_FORGED                  2.264
+score MILLION_EUR                    1.348
 score MILLION_HUNDRED                0.001
 score MIMEOLE_DIRECT_TO_MX           0.001
 score MIME_NO_TEXT                   1.999
-score MIXED_CENTER_CASE              2.499
+score MIXED_CENTER_CASE              2.500
 score MIXED_CTYPE_CASE               2.499
 score MIXED_ES                       2.699
-score MIXED_HREF_CASE                1.937
+score MIXED_HREF_CASE                1.803
 score MONEY_FORM_SHORT               0.001
 score MONEY_FRAUD_3                  0.001
-score MONEY_FRAUD_5                  0.001 # force non-zero
+score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.855
-score MONEY_FROM_41                  1.685
+score MONEY_FREEMAIL_REPTO           2.144
+score MONEY_FROM_41                  1.394
 score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.885
+score MONEY_NOHTML                   2.499
 score MSM_PRIO_REPTO                 2.499
 score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -0.080
-score NORDNS_LOW_CONTRAST            1.787
+score NICE_REPLY_A                   -3.560
+score NORDNS_LOW_CONTRAST            1.786
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score OBFU_BITCOIN                   0.728
+score OBFU_BITCOIN                   0.969
 score ODD_FREEM_REPTO                2.999
 score PDS_BAD_THREAD_QP_64           0.999
-score PDS_BTC_ID                     0.500
+score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.999
 score PDS_CPANEL_PORT_SPOOFEDURL     0.499
-score PDS_DBL_URL_LINKBAIT           1.185
+score PDS_DBL_URL_LINKBAIT           1.176
 score PDS_OTHER_BAD_TLD              1.999
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PDS_URISHRT_LOCALPART_SUBJ     0.999
+score PDS_URISHRT_LOCALPART_SUBJ     0.001
 score PHISH_ATTACH                   2.399
-score PHP_ORIG_SCRIPT                1.305
+score PHP_ORIG_SCRIPT                1.296
 score PHP_SCRIPT                     2.499
-score PP_MIME_FAKE_ASCII_TEXT        1.000
-score RATWARE_NO_RDNS                0.290
-score REPTO_419_FRAUD                3.000
-score REPTO_419_FRAUD_GM             2.802
+score PP_MIME_FAKE_ASCII_TEXT        0.999
+score RATWARE_NO_RDNS                2.728
+score REPTO_419_FRAUD                2.838
+score REPTO_419_FRAUD_GM             2.403
 score REPTO_419_FRAUD_GM_LOOSE       0.999
-score REPTO_419_FRAUD_HM             3.000
+score REPTO_419_FRAUD_HM             2.999
 score RISK_FREE                      2.599
 score SCC_BOGUS_CTE_1                0.001
-score SCC_CANSPAM_2                  4.270
+score SCC_CANSPAM_2                  4.282
 score SCC_ISEMM_LID_1B               1.499
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
-score SHORTENER_SHORT_IMG            0.188
-score SHORT_IMG_SUSP_NTLD            0.686
+score SHORTENER_SHORT_IMG            2.499
+score SHORT_IMG_SUSP_NTLD            1.223
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
-score SPOOF_GMAIL_MID                0.896
-score STATIC_XPRIO_OLE               0.937
+score SPOOF_GMAIL_MID                1.189
+score STATIC_XPRIO_OLE               1.252
 score SUBJ_ATTENTION                 0.499
-score SUBJ_LACKS_WORDS               2.499
-score SUSP_UTF8_WORD_COMBO           0.986
+score SUBJ_LACKS_WORDS               2.102
+score SUSP_UTF8_WORD_COMBO           1.392
 score SUSP_UTF8_WORD_FROM            1.999
-score SUSP_UTF8_WORD_SUBJ            1.919
+score SUSP_UTF8_WORD_SUBJ            1.999
 score THIS_AD                        1.799
-score THIS_IS_ADV_SUSP_NTLD          0.512
+score THIS_IS_ADV_SUSP_NTLD          1.012
 score TO_EQ_FM_DIRECT_MX             0.001
-score TO_EQ_FM_DOM_HTML_IMG          2.328
-score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           2.537
+score TO_EQ_FM_DOM_HTML_IMG          1.795
+score TO_EQ_FM_DOM_HTML_ONLY         0.001
+score TO_IN_SUBJ                     0.100
+score TO_NAME_SUBJ_NO_RDNS           2.964
 score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.948
+score TO_NO_BRKTS_HTML_IMG           1.552
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               2.480
+score TO_NO_BRKTS_MSFT               1.499
 score TO_NO_BRKTS_NORDNS_HTML        1.999
-score TO_NO_BRKTS_PCNT               2.499
+score TO_NO_BRKTS_PCNT               2.500
 score TVD_RCVD_SPACE_BRACKET         2.499
 score TVD_SPACE_ENCODED              2.499
-score TVD_SPACE_RATIO_MINFP          2.248
+score TVD_SPACE_RATIO_MINFP          2.103
 score UNDISC_FREEM                   2.899
-score UNDISC_MONEY                   2.587
+score UNDISC_MONEY                   1.591
 score UNICODE_OBFU_ASC               2.499
-score UNICODE_OBFU_ZW_MANY           0.001
+score UNICODE_OBFU_ZW_MANY           0.001 # force non-zero
 score URI_BUFFLY                     1.999
-score URI_CLOUDFLAREIPFS             0.321
+score URI_CLOUDFLAREIPFS             0.054
 score URI_DOTEDU                     1.999
-score URI_DWEBIPFS                   3.499
+score URI_DWEBIPFS                   2.300
 score URI_GOOGDRAWPREVIEW_MINFP      3.499
-score URI_GOOGLE_PROXY               0.502
+score URI_GOOGLE_PROXY               0.501
 score URI_GOOG_STO_SPAMMY            2.999
-score URI_GOOG_STO_SUBD_SPAMMY       2.971
-score URI_IMG_CWINDOWSNET            1.341
+score URI_GOOG_STO_SUBD_SPAMMY       2.999
+score URI_IMG_CWINDOWSNET            1.551
 score URI_IPFSIO                     3.499
 score URI_MALWARE_BH                 0.999
-score URI_ONLY_MSGID_MALF            0.016
-score URI_OPTOUT_3LD                 1.927
-score URI_PHISH                      3.297
+score URI_ONLY_MSGID_MALF            0.001
+score URI_OPTOUT_3LD                 1.917
+score URI_PHISH                      3.536
 score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.199
 score URI_WP_HACKED                  3.499
 score URI_WP_HACKED_2                2.401
-score VFY_ACCT_NORDNS                2.500
-score VISTA_COST                     1.848
+score VFY_ACCT_NORDNS                2.503
+score VISTA_COST                     2.499
 score VISTA_TONOM_EQ_TOLOC           2.499
-score WORD_INVIS_MANY                0.897
+score WORD_INVIS_MANY                0.906
 score XFER_LOTSA_MONEY               0.001
 score XM_RANDOM                      2.499
 score XPRIO                          0.001
-score XPRIO_VISTA                    0.610
+score XPRIO_VISTA                    1.948
+score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000
@@ -263,6 +266,7 @@
 score BITCOIN_IMGUR                  1.000
 score BITCOIN_OBFU_SUBJ              1.000
 score BITCOIN_ONAN                   1.000
+score BITCOIN_PAY_ME                 1.000
 score BITCOIN_SPAM_01                1.000
 score BITCOIN_SPAM_04                1.000
 score BITCOIN_SPAM_06                1.000
@@ -301,17 +305,15 @@
 score GOOG_STO_HTML_PHISH_MANY       1.000
 score GOOG_STO_IMG_HTML              1.000
 score HAS_X_OUTGOING_SPAM_STAT       1.000
+score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
 score HOSTED_IMG_DQ_UNSUB            1.000
 score HOSTED_IMG_MULTI               1.000
 score HREF_EMPTY_PHPMAIL             1.000
-score HREF_EMPTY_XANTIABUSE          1.000
-score HREF_EMPTY_XAUTHED             1.000
 score HTML_OFF_PAGE                  1.000
 score HTML_SHRT_CMNT_OBFU_MANY       1.000
-score IMG_ONLY_FM_DOM_INFO           1.000
 score JH_SPAMMY_HEADERS              1.000
 score JH_SPAMMY_PATTERN01            1.000
 score JH_SPAMMY_PATTERN02            1.000

diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index c8a104c..2e608e8 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3

@@ -1,61 +1,61 @@
 # Using score set 1 logs for revision 1921005 from:
 # ham-net-ena-week0.r1921005.log ham-net-ena-week1.r1921005.log ham-net-ena-week4.r1921005.log ham-net-giovanni-ham.r1921005.log ham-net-giovanni-spammy.r1921005.log ham-net-giovanni-spam.r1921005.log ham-net-grenier.r1921005.log ham-net-jhardin.r1921005.log ham-net-llanga.r1921005.log ham-net-mmiroslaw-mails-ham.r1921005.log ham-net-mmiroslaw-mails-spam.r1921005.log ham-net-spamsponge.r1921005.log ham-net-tsz-corpus.r1921005.log ham-net-whyscream.r1921005.log spam-net-ena-week0.r1921005.log spam-net-ena-week1.r1921005.log spam-net-ena-week4.r1921005.log spam-net-giovanni-ham.r1921005.log spam-net-giovanni-spammy.r1921005.log spam-net-giovanni-spam.r1921005.log spam-net-grenier.r1921005.log spam-net-jhardin.r1921005.log spam-net-llanga.r1921005.log spam-net-mmiroslaw-mails-ham.r1921005.log spam-net-mmiroslaw-mails-spam.r1921005.log spam-net-spamsponge.r1921005.log spam-net-tsz-corpus.r1921005.log spam-net-whyscream.r1921005.log
 
-score ACCT_PHISHING_MANY             3.000
+score ACCT_PHISHING_MANY             2.999
 score AC_BR_BONANZA                  0.001 # force non-zero
 score AC_DIV_BONANZA                 0.001
-score AC_FROM_MANY_DOTS              2.500
+score AC_FROM_MANY_DOTS              2.499
 score AC_HTML_NONSENSE_TAGS          1.999
-score AC_POST_EXTRAS                 0.793
-score ADMITS_SPAM                    1.920
-score ADVANCE_FEE_2_NEW_FORM         1.139
-score ADVANCE_FEE_2_NEW_FRM_MNY      0.783
-score ADVANCE_FEE_2_NEW_MONEY        2.000
+score AC_POST_EXTRAS                 0.685
+score ADMITS_SPAM                    1.815
+score ADVANCE_FEE_2_NEW_FORM         1.146
+score ADVANCE_FEE_2_NEW_FRM_MNY      1.519
+score ADVANCE_FEE_2_NEW_MONEY        1.999
 score ADVANCE_FEE_3_NEW              0.001
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.924
-score ADVANCE_FEE_3_NEW_MONEY        1.232
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.502
+score ADVANCE_FEE_3_NEW_MONEY        1.237
 score ADVANCE_FEE_4_NEW              0.001
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW              0.001
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_5_NEW_MONEY        0.001
-score AMAZON_IMG_NOT_RCVD_AMZN       0.807
+score AMAZON_IMG_NOT_RCVD_AMZN       0.802
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
 score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.001
 score BIGNUM_EMAILS_FREEM            0.001
 score BIGNUM_EMAILS_MANY             2.999
-score BITCOIN_DEADLINE               3.000
-score BITCOIN_EXTORT_01              3.000
+score BITCOIN_DEADLINE               2.999
+score BITCOIN_EXTORT_01              2.999
 score BITCOIN_MALWARE                0.001
 score BITCOIN_PAY_ME                 2.999
-score BITCOIN_SPAM_02                2.499
+score BITCOIN_SPAM_02                2.423
 score BITCOIN_SPAM_03                2.499
 score BITCOIN_SPAM_05                2.499
 score BITCOIN_SPAM_07                0.001
 score BITCOIN_SPAM_09                1.499
-score BITCOIN_TOEQFM                 1.423
+score BITCOIN_TOEQFM                 1.418
 score BITCOIN_VISTA                  0.001
 score BITCOIN_XPRIO                  0.001
-score BITCOIN_YOUR_INFO              0.301
-score BODY_URI_ONLY                  0.925
+score BITCOIN_YOUR_INFO              0.966
+score BODY_URI_ONLY                  0.926
 score BOGUS_MIME_VERSION             3.499
-score CN_B2B_SPAMMER                 2.299
-score COMPENSATION                   1.444
+score CN_B2B_SPAMMER                 2.300
+score COMPENSATION                   1.219
 score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              0.257
+score CTE_8BIT_MISMATCH              0.258
 score DEAR_BENEFICIARY               0.001
-score DEAR_NOBODY                    2.425
-score DKIMWL_BL                      2.431
-score DKIMWL_WL_HIGH                 -0.146
-score DKIMWL_WL_MED                  -0.001 # force non-zero
+score DEAR_NOBODY                    2.419
+score DKIMWL_BL                      0.172
+score DKIMWL_WL_HIGH                 -0.144
+score DKIMWL_WL_MED                  -0.001
 score DKIMWL_WL_MEDHI                -0.001
-score DOS_BODY_HIGH_NO_MID           3.269
+score DOS_BODY_HIGH_NO_MID           3.274
 score DSN_NO_MIMEVERSION             1.999
-score DUP_SUSP_HDR                   1.130
+score DUP_SUSP_HDR                   0.403
 score DYNAMIC_IMGUR                  0.001
-score ENCRYPTED_MESSAGE              -0.999
-score END_FUTURE_EMAILS              1.933
+score ENCRYPTED_MESSAGE              -1.000
+score END_FUTURE_EMAILS              1.832
 score FACEBOOK_IMG_NOT_RCVD_FB       1.999
 score FBI_MONEY                      0.001
 score FBI_SPOOF                      0.001
@@ -63,129 +63,129 @@
 score FONT_INVIS_LONG_LINE           2.999
 score FONT_INVIS_MSGID               2.499
 score FONT_INVIS_NORDNS              0.001
-score FONT_INVIS_POSTEXTRAS          1.509
-score FORGED_SPF_HELO                1.868
+score FONT_INVIS_POSTEXTRAS          1.610
+score FORGED_SPF_HELO                1.866
 score FORM_FRAUD                     0.999
 score FORM_FRAUD_3                   2.799
 score FORM_FRAUD_5                   0.001
 score FOUND_YOU                      0.001
-score FREEMAIL_FORGED_FROMDOMAIN     0.001
-score FROM_ADDR_WS                   2.151
-score FROM_BANK_NOAUTH               0.999
+score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
+score FROM_ADDR_WS                   2.145
+score FROM_BANK_NOAUTH               1.000
 score FROM_FMBLA_NEWDOM              1.499
-score FROM_FMBLA_NEWDOM14            0.005
+score FROM_FMBLA_NEWDOM14            0.007
 score FROM_FMBLA_NEWDOM28            0.799
-score FROM_GOV_DKIM_AU               -0.368
+score FROM_GOV_DKIM_AU               -0.787
 score FROM_GOV_SPOOF                 0.999
-score FROM_IN_TO_AND_SUBJ            1.300
+score FROM_IN_TO_AND_SUBJ            1.299
 score FROM_LONG_DOM                  1.499
 score FROM_LONG_DOM_MINFP            2.499
 score FROM_MISSPACED                 0.001
 score FROM_MISSP_DYNIP               0.001
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            0.817
+score FROM_MISSP_FREEMAIL            0.748
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_PHISH               3.499
-score FROM_MISSP_REPLYTO             0.892
+score FROM_MISSP_REPLYTO             0.891
 score FROM_MISSP_SPF_FAIL            0.001
-score FROM_MISSP_TO_UNDISC           1.740
+score FROM_MISSP_TO_UNDISC           1.419
 score FROM_MISSP_USER                0.001
-score FROM_NTLD_LINKBAIT             1.594
+score FROM_NTLD_LINKBAIT             0.899
 score FROM_NTLD_REPLY_FREEMAIL       0.001
 score FROM_SUSPICIOUS_NTLD           0.499
-score FROM_SUSPICIOUS_NTLD_FP        2.000
+score FROM_SUSPICIOUS_NTLD_FP        1.999
 score FROM_UNBAL1                    2.599
 score FROM_UNBAL2                    2.599
 score FROM_WSP_TRAIL                 2.399
-score FSL_BULK_SIG                   0.383
+score FSL_BULK_SIG                   0.434
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HAS_TINYURL                2.689
-score FSL_HELO_BARE_IP_2             1.162
+score FSL_HAS_TINYURL                2.700
+score FSL_HELO_BARE_IP_2             1.164
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   3.099
 score FUZZY_APPLE                    2.699
 score FUZZY_BITCOIN                  2.299
 score FUZZY_IMPORTANT                2.599
-score FUZZY_TRUMP                    3.755
+score FUZZY_TRUMP                    3.036
 score FUZZY_TRUSTWALLET              2.299
-score FUZZY_WALLET                   0.633
+score FUZZY_WALLET                   0.640
 score GB_CUSTOM_HTM_URI              1.499
 score GB_FAKE_RF_SHORT               1.257
 score GB_FREEMAIL_DISPTO             0.001
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
-score GB_HASHBL_BTC                  0.701
+score GB_HASHBL_BTC                  0.696
 score GOOG_STO_IMG_NOHTML            0.001
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_NO_RELAY                 0.401
-score HDRS_MISSP                     2.352
+score HAS_X_NO_RELAY                 1.379
+score HDRS_MISSP                     2.353
 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 HK_LOTTO                       1.000
-score HK_NAME_FM_MR_MRS              0.038
+score HK_LOTTO                       0.999
+score HK_NAME_FM_MR_MRS              0.239
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.001
 score HK_RANDOM_FROM                 0.999
 score HK_RANDOM_REPLYTO              0.999
 score HK_SCAM                        0.001
 score HK_WIN                         0.999
-score HOSTED_IMG_DIRECT_MX           2.077
+score HOSTED_IMG_DIRECT_MX           1.614
 score HOSTED_IMG_FREEM               0.001
-score HOSTED_IMG_MULTI_PUB_01        0.649
-score HREF_EMPTY_NORDNS              0.307
+score HOSTED_IMG_MULTI_PUB_01        0.648
+score HREF_EMPTY_NORDNS              0.379
 score HTML_ENTITY_ASCII              2.999
-score HTML_SINGLET_MANY              1.674
+score HTML_SINGLET_MANY              1.675
 score HTML_TEXT_INVISIBLE_FONT       0.001
-score HTML_TEXT_INVISIBLE_STYLE      2.634
-score IMG_ONLY_FM_DOM_INFO           0.782
-score LONG_HEX_URI                   1.571
-score LONG_IMG_URI                   1.399
-score LONG_INVISIBLE_TEXT            1.747
+score HTML_TEXT_INVISIBLE_STYLE      2.625
+score IMG_ONLY_FM_DOM_INFO           0.779
+score LONG_HEX_URI                   1.671
+score LONG_IMG_URI                   1.263
+score LONG_INVISIBLE_TEXT            1.750
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    0.001
 score LOTTO_DEPT                     1.999
-score MALFORMED_FREEMAIL             2.045
+score MALFORMED_FREEMAIL             2.043
 score MALWARE_NORDNS                 0.001
 score MALWARE_PASSWORD               0.001
 score MALW_ATTACH                    2.199
 score MANY_SPAN_IN_TEXT              2.299
-score MANY_SUBDOM                    3.199
+score MANY_SUBDOM                    3.164
 score MILLION_EUR                    0.001
 score MILLION_HUNDRED                0.001
 score MIMEOLE_DIRECT_TO_MX           0.001
-score MIME_NO_TEXT                   1.741
+score MIME_NO_TEXT                   1.755
 score MIXED_CENTER_CASE              2.499
 score MIXED_CTYPE_CASE               2.399
-score MIXED_ES                       2.699
-score MIXED_HREF_CASE                1.898
+score MIXED_ES                       2.700
+score MIXED_HREF_CASE                1.851
 score MONEY_FORM_SHORT               0.001
-score MONEY_FRAUD_3                  2.899
+score MONEY_FRAUD_3                  2.779
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           0.001
-score MONEY_FROM_41                  0.841
-score MONEY_FROM_MISSP               0.001
-score MONEY_NOHTML                   1.491
-score MSM_PRIO_REPTO                 2.499
-score NA_DOLLARS                     0.046
-score NICE_REPLY_A                   -1.206
-score NORDNS_LOW_CONTRAST            1.084
+score MONEY_FREEMAIL_REPTO           0.004
+score MONEY_FROM_41                  0.775
+score MONEY_FROM_MISSP               0.001 # force non-zero
+score MONEY_NOHTML                   1.570
+score MSM_PRIO_REPTO                 2.434
+score NA_DOLLARS                     0.052
+score NICE_REPLY_A                   -2.890
+score NORDNS_LOW_CONTRAST            1.064
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001 # force non-zero
-score NSL_RCVD_HELO_USER             1.724
-score OBFU_BITCOIN                   0.618
-score ODD_FREEM_REPTO                1.394
-score PDS_BTC_ID                     0.499
+score NSL_RCVD_HELO_USER             0.662
+score OBFU_BITCOIN                   0.001
+score ODD_FREEM_REPTO                1.397
+score PDS_BTC_ID                     0.500
 score PDS_BTC_MSGID                  0.001
-score PDS_HELO_SPF_FAIL              1.999
-score PDS_OTHER_BAD_TLD              2.000
+score PDS_HELO_SPF_FAIL              2.000
+score PDS_OTHER_BAD_TLD              1.999
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
 score PHISH_ATTACH                   2.299
-score PHP_ORIG_SCRIPT                1.871
-score PHP_SCRIPT                     2.499
+score PHP_ORIG_SCRIPT                1.874
+score PHP_SCRIPT                     2.500
 score PP_MIME_FAKE_ASCII_TEXT        0.261
-score RATWARE_NO_RDNS                0.427
+score RATWARE_NO_RDNS                2.859
 score RCVD_IN_IADB_COURT             -0.001
 score RCVD_IN_IADB_DMARC             -0.001
 score RCVD_IN_IADB_ESP               -0.001
@@ -193,73 +193,73 @@
 score RCVD_IN_IADB_URG               -0.001
 score RCVD_IN_MSPIKE_H2              -0.001
 score REPTO_419_FRAUD                2.999
-score REPTO_419_FRAUD_GM             1.531
-score REPTO_419_FRAUD_GM_LOOSE       0.999
-score REPTO_419_FRAUD_HM             2.513
+score REPTO_419_FRAUD_GM             1.502
+score REPTO_419_FRAUD_GM_LOOSE       1.000
+score REPTO_419_FRAUD_HM             2.509
 score RISK_FREE                      2.499
-score SCC_BOGUS_CTE_1                1.259
-score SCC_CANSPAM_2                  4.099
+score SCC_BOGUS_CTE_1                1.307
+score SCC_CANSPAM_2                  3.341
 score SCC_ISEMM_LID_1B               1.499
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
 score SHORTENER_SHORT_IMG            2.499
-score SHORT_IMG_SUSP_NTLD            1.499
-score SPOOFED_FREEMAIL               0.001 # force non-zero
+score SHORT_IMG_SUSP_NTLD            0.486
+score SPOOFED_FREEMAIL               0.001
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
-score SPOOFED_FREEM_REPTO            2.500
+score SPOOFED_FREEM_REPTO            2.499
 score SPOOF_GMAIL_MID                1.499
 score STATIC_XPRIO_OLE               0.001
 score SUBJ_ATTENTION                 0.001
-score SUBJ_LACKS_WORDS               1.985
-score SUSP_UTF8_WORD_COMBO           0.174
-score SUSP_UTF8_WORD_FROM            1.999
+score SUBJ_LACKS_WORDS               1.942
+score SUSP_UTF8_WORD_COMBO           0.025
+score SUSP_UTF8_WORD_FROM            2.000
 score SUSP_UTF8_WORD_SUBJ            1.999
 score THIS_AD                        2.199
-score THIS_IS_ADV_SUSP_NTLD          1.499
+score THIS_IS_ADV_SUSP_NTLD          0.171
 score TO_EQ_FM_DIRECT_MX             0.001
 score TO_EQ_FM_DOM_HTML_IMG          2.199
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_IN_SUBJ                     0.001 # force non-zero
-score TO_NAME_SUBJ_NO_RDNS           0.861
-score TO_NO_BRKTS_FROM_MSSP          0.952
+score TO_IN_SUBJ                     0.001
+score TO_NAME_SUBJ_NO_RDNS           0.841
+score TO_NO_BRKTS_FROM_MSSP          0.979
 score TO_NO_BRKTS_HTML_IMG           1.999
 score TO_NO_BRKTS_HTML_ONLY          1.999
-score TO_NO_BRKTS_MSFT               0.745
+score TO_NO_BRKTS_MSFT               0.664
 score TO_NO_BRKTS_NORDNS_HTML        0.001
 score TO_NO_BRKTS_PCNT               2.499
-score TVD_RCVD_SPACE_BRACKET         2.206
+score TVD_RCVD_SPACE_BRACKET         2.299
 score TVD_SPACE_ENCODED              2.499
-score TVD_SPACE_RATIO_MINFP          0.001
-score UNDISC_FREEM                   1.443
-score UNDISC_MONEY                   2.007
+score TVD_SPACE_RATIO_MINFP          0.001 # force non-zero
+score UNDISC_FREEM                   1.321
+score UNDISC_MONEY                   1.928
 score UNICODE_OBFU_ASC               2.499
 score UNICODE_OBFU_ZW_MANY           0.001
-score URIBL_CT_SURBL                 1.077
+score URIBL_CT_SURBL                 1.254
 score URIBL_DM_SURBL                 0.001
-score URI_BUFFLY                     2.000
-score URI_CLOUDFLAREIPFS             0.001 # force non-zero
+score URI_BUFFLY                     1.999
+score URI_CLOUDFLAREIPFS             0.001
 score URI_DOTEDU                     1.999
-score URI_DWEBIPFS                   1.553
-score URI_GOOGDRAWPREVIEW_MINFP      3.500
+score URI_DWEBIPFS                   1.549
+score URI_GOOGDRAWPREVIEW_MINFP      3.499
 score URI_GOOGLE_PROXY               1.179
-score URI_GOOG_STO_SPAMMY            2.915
-score URI_IMG_CWINDOWSNET            0.202
+score URI_GOOG_STO_SPAMMY            2.923
+score URI_IMG_CWINDOWSNET            0.206
 score URI_IPFSIO                     3.499
 score URI_ONLY_MSGID_MALF            1.999
 score URI_OPTOUT_3LD                 1.999
-score URI_PHISH                      1.406
+score URI_PHISH                      1.377
 score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.399
 score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                1.561
+score URI_WP_HACKED_2                1.698
 score VFY_ACCT_NORDNS                2.999
 score VISTA_COST                     0.001
 score VISTA_TONOM_EQ_TOLOC           2.252
-score WORD_INVIS_MANY                2.651
+score WORD_INVIS_MANY                2.649
 score XFER_LOTSA_MONEY               0.001
 score XM_RANDOM                      2.499
-score XPRIO                          0.001
-score XPRIO_VISTA                    0.239
+score XPRIO                          0.001 # force non-zero
+score XPRIO_VISTA                    1.399
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000

diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index e103483..6371e0b 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: 223024  27.188%  (97.782% of non-spam corpus)
-# Correctly spam:     376629  45.913%  (63.595% of spam corpus)
-# False positives:      5058  0.617%  (2.218% of nonspam, 391490 weighted)
-# False negatives:    215606  26.283%  (36.405% of spam, 598413 weighted)
-# Average score for spam:  7.6    nonspam: 0.9
-# Average for false-pos:   6.0  false-neg: 2.8
-# TOTAL:              820317  100.00%
+# Correctly non-spam: 223036  27.281%  (97.811% of non-spam corpus)
+# Correctly spam:     375253  45.900%  (63.655% of spam corpus)
+# False positives:      4992  0.611%  (2.189% of nonspam, 385788 weighted)
+# False negatives:    214256  26.207%  (36.345% of spam, 613805 weighted)
+# Average score for spam:  7.7    nonspam: 0.9
+# Average for false-pos:   6.0  false-neg: 2.9
+# TOTAL:              817537  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  27913  97.72%
-# Correctly spam:      47098  63.68%
-# False positives:       652  2.28%
-# False negatives:     26860  36.32%
-# TCR(l=50): 1.243828  SpamRecall: 63.682%  SpamPrec: 98.635%
+# Correctly non-spam:  27904  97.72%
+# Correctly spam:      46837  63.63%
+# False positives:       651  2.28%
+# False negatives:     26776  36.37%
+# TCR(l=50): 1.240822  SpamRecall: 63.626%  SpamPrec: 98.629%
 
 ##### 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: 218956  96.00%
-# Correctly spam:     215722  36.43%
-# False positives:      9126  4.00%
-# False negatives:    376513  63.57%
-# TCR(l=50): 0.711126  SpamRecall: 36.425%  SpamPrec: 95.941%
+# Correctly non-spam: 218912  96.00%
+# Correctly spam:     217674  36.92%
+# False positives:      9116  4.00%
+# False negatives:    371835  63.08%
+# TCR(l=50): 0.712281  SpamRecall: 36.925%  SpamPrec: 95.980%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  27363  95.79%
-# Correctly spam:      26930  36.41%
-# False positives:      1202  4.21%
-# False negatives:     47028  63.59%
-# TCR(l=50): 0.690370  SpamRecall: 36.413%  SpamPrec: 95.727%
+# Correctly non-spam:  27421  96.03%
+# Correctly spam:      27122  36.84%
+# False positives:      1134  3.97%
+# False negatives:     46491  63.16%
+# TCR(l=50): 0.713366  SpamRecall: 36.844%  SpamPrec: 95.987%

diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 7161f88..f7072c2 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1

@@ -1,11 +1,11 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 199191  30.734%  (98.903% of non-spam corpus)
-# Correctly spam:     360014  55.548%  (80.591% of spam corpus)
-# False positives:      2210  0.341%  (1.097% of nonspam, 366418 weighted)
-# False negatives:     86703  13.378%  (19.409% of spam, 205761 weighted)
-# Average score for spam:  12.1    nonspam: 0.0
+# Correctly non-spam: 199196  30.735%  (98.905% of non-spam corpus)
+# Correctly spam:     359902  55.530%  (80.566% of spam corpus)
+# False positives:      2205  0.340%  (1.095% of nonspam, 366133 weighted)
+# False negatives:     86815  13.395%  (19.434% of spam, 206604 weighted)
+# Average score for spam:  12.1    nonspam: -0.0
 # Average for false-pos:   7.5  false-neg: 2.4
 # TOTAL:              648118  100.00%
 
@@ -13,11 +13,11 @@
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  24903  98.88%
-# Correctly spam:      44939  80.67%
-# False positives:       281  1.12%
-# False negatives:     10765  19.33%
-# TCR(l=50): 2.244771  SpamRecall: 80.675%  SpamPrec: 99.379%
+# Correctly non-spam:  24898  98.86%
+# Correctly spam:      44933  80.66%
+# False positives:       286  1.14%
+# False negatives:     10771  19.34%
+# TCR(l=50): 2.221850  SpamRecall: 80.664%  SpamPrec: 99.368%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
commit	a70a07a3943a6d0a0348e74b1b94b51f6fc841d6	[log] [tgz]
author	spamassassin_role <spamassassin_role@unknown>	Sat Oct 05 02:50:23 2024 +0000
committer	spamassassin_role <spamassassin_role@unknown>	Sat Oct 05 02:50:23 2024 +0000
tree	279e8588fbf1ddc47ae584cec95002b0b637d50d
parent	263c43778f386362ab15fda09b075fd229821efe [diff]