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

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1911377 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index baa12b1..f899261 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -15,52 +15,57 @@
 score ADMITS_SPAM                           2.896 0.001 2.896 0.001
 score ADULT_DATING_COMPANY                  10.000 10.000 10.000 10.000
 score ADVANCE_FEE_2_NEW_FORM                1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY             1.754 1.000 1.754 1.000
+score ADVANCE_FEE_2_NEW_FRM_MNY             2.499 1.000 2.499 1.000
 score ADVANCE_FEE_2_NEW_MONEY               1.997 1.999 1.997 1.999
-score ADVANCE_FEE_3_NEW                     3.496 3.264 3.496 3.264
+score ADVANCE_FEE_3_NEW                     3.496 3.265 3.496 3.265
 score ADVANCE_FEE_3_NEW_MONEY               0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_MONEY               2.315 0.552 2.315 0.552
-score ADVANCE_FEE_5_NEW_FRM_MNY             1.200 2.999 1.200 2.999
-score ADVANCE_FEE_5_NEW_MONEY               0.001 0.685 0.001 0.685
-score AD_PREFS                              0.001 0.296 0.001 0.296
+score ADVANCE_FEE_4_NEW_FRM_MNY             0.001 0.001 0.001 0.001
+score ADVANCE_FEE_4_NEW_MONEY               2.480 0.549 2.480 0.549
+score ADVANCE_FEE_5_NEW_FRM_MNY             2.896 2.999 2.896 2.999
+score ADVANCE_FEE_5_NEW_MONEY               0.001 0.686 0.001 0.686
+score AD_PREFS                              0.001 0.395 0.001 0.395
 score ALIBABA_IMG_NOT_RCVD_ALI              1.000 1.000 1.000 1.000
-score AMAZON_IMG_NOT_RCVD_AMZN              0.451 0.001 0.451 0.001
+score AMAZON_IMG_NOT_RCVD_AMZN              0.535 0.001 0.535 0.001
 score APP_DEVELOPMENT_FREEM                 1.000 1.000 1.000 1.000
 score APP_DEVELOPMENT_NORDNS                1.000 1.000 1.000 1.000
+score ARC_SIGNED                            0.001 0.001 0.001 0.001
+score ARC_VALID                             0.001 0.001 0.001 0.001
 score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.001 0.001 0.001 0.001
+score AXB_XM_FORGED_OL2600                  0.001 0.001 0.001 0.001
 score BEBEE_IMG_NOT_RCVD_BB                 1.000 1.000 1.000 1.000
 score BIGNUM_EMAILS_FREEM                   0.001 1.000 0.001 1.000
 score BIGNUM_EMAILS_MANY                    2.996 1.000 2.996 1.000
 score BITCOIN_BOMB                          1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE                      2.704 2.563 2.704 2.563
-score BITCOIN_EXTORT_01                     4.094 2.359 4.094 2.359
+score BITCOIN_DEADLINE                      2.996 2.628 2.996 2.628
+score BITCOIN_EXTORT_01                     4.254 2.302 4.254 2.302
 score BITCOIN_EXTORT_02                     1.000 1.000 1.000 1.000
 score BITCOIN_IMGUR                         1.000 1.000 1.000 1.000
 score BITCOIN_MALF_HTML                     3.496 3.499 3.496 3.499
-score BITCOIN_MALWARE                       0.750 0.164 0.750 0.164
+score BITCOIN_MALWARE                       0.906 0.191 0.906 0.191
 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                        1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_01                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_02                       0.994 0.227 0.994 0.227
+score BITCOIN_SPAM_02                       1.005 0.274 1.005 0.274
 score BITCOIN_SPAM_03                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_04                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_05                       0.001 2.205 0.001 2.205
+score BITCOIN_SPAM_05                       0.001 2.168 0.001 2.168
 score BITCOIN_SPAM_06                       1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07                       0.789 0.001 0.789 0.001
+score BITCOIN_SPAM_07                       0.323 0.001 0.323 0.001
 score BITCOIN_SPAM_08                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_09                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_10                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_11                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_12                       1.000 1.000 1.000 1.000
 score BITCOIN_SPF_ONLYALL                   0.001 1.000 0.001 1.000
-score BITCOIN_XPRIO                         0.397 0.190 0.397 0.190
-score BITCOIN_YOUR_INFO                     2.996 2.999 2.996 2.999
+score BITCOIN_XPRIO                         0.571 0.271 0.571 0.271
+score BITCOIN_YOUR_INFO                     2.996 3.000 2.996 3.000
 score BODY_EMAIL_419_FRAUD_GM               0.001 1.000 0.001 1.000
-score BODY_SINGLE_URI                       2.497 2.500 2.497 2.500
-score BODY_SINGLE_WORD                      0.895 0.001 0.895 0.001
-score BODY_URI_ONLY                         2.261 1.185 2.261 1.185
-score BOGUS_MIME_VERSION                    3.496 1.000 3.496 1.000
+score BODY_SINGLE_URI                       2.497 2.499 2.497 2.499
+score BODY_SINGLE_WORD                      1.746 0.001 1.746 0.001
+score BODY_URI_ONLY                         2.029 1.188 2.029 1.188
+score BOGUS_MIME_VERSION                    2.706 1.000 2.706 1.000
 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
@@ -69,12 +74,12 @@
 score CANT_SEE_AD                           1.000 1.000 1.000 1.000
 score CK_HELO_GENERIC                       0.248 0.249 0.248 0.249
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
-score COMPENSATION                          0.001 1.000 0.001 1.000
+score COMPENSATION                          0.144 1.000 0.144 1.000
 score CONTENT_AFTER_HTML                    1.000 1.000 1.000 1.000
 score CONTENT_AFTER_HTML_WEAK               1.000 1.000 1.000 1.000
 score CTE_8BIT_MISMATCH                     0.998 0.001 0.998 0.001
 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_BENEFICIARY                      2.450 0.001 2.450 0.001
 score DKIMWL_BL                             0.001 2.999 0.001 2.999
 score DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
 score DKIMWL_WL_HIGH                        0.001 -0.001 0.001 -0.001
@@ -83,76 +88,83 @@
 score DOS_BODY_HIGH_NO_MID                  2.696 0.001 2.696 0.001
 score DOTGOV_IMAGE                          1.000 1.000 1.000 1.000
 score DSN_NO_MIMEVERSION                    1.997 1.000 1.997 1.000
-score DYNAMIC_IMGUR                         2.955 1.000 2.955 1.000
+score DYNAMIC_IMGUR                         1.725 1.000 1.725 1.000
 score EBAY_IMG_NOT_RCVD_EBAY                1.000 1.000 1.000 1.000
 score ENCRYPTED_MESSAGE                     -0.998 -1.000 -0.998 -1.000
 score END_FUTURE_EMAILS                     2.497 2.499 2.497 2.499
 score ENVFROM_GOOG_TRIX                     1.000 1.000 1.000 1.000
 score FACEBOOK_IMG_NOT_RCVD_FB              1.000 1.000 1.000 1.000
+score FAKE_REPLY_B                          1.755 0.001 1.755 0.001
 score FBI_MONEY                             1.000 1.000 1.000 1.000
 score FBI_SPOOF                             1.000 1.000 1.000 1.000
-score FILL_THIS_FORM                        1.098 0.899 1.098 0.899
+score FILL_THIS_FORM                        1.098 1.000 1.098 1.000
 score FONT_INVIS_DIRECT                     0.001 0.001 0.001 0.001
 score FONT_INVIS_DOTGOV                     1.000 1.000 1.000 1.000
 score FONT_INVIS_HTML_NOHTML                1.000 1.000 1.000 1.000
 score FONT_INVIS_LONG_LINE                  2.996 2.999 2.996 2.999
-score FONT_INVIS_MSGID                      1.934 0.001 1.934 0.001
+score FONT_INVIS_MSGID                      1.943 0.001 1.943 0.001
 score FONT_INVIS_NORDNS                     1.000 1.000 1.000 1.000
-score FONT_INVIS_POSTEXTRAS                 3.313 3.087 3.313 3.087
-score FORGED_SPF_HELO                       0.001 2.199 0.001 2.199
+score FONT_INVIS_POSTEXTRAS                 2.753 3.084 2.753 3.084
 score FORM_FRAUD                            0.998 1.000 0.998 1.000
-score FORM_FRAUD_5                          0.903 0.001 0.903 0.001
+score FORM_FRAUD_3                          2.690 0.001 2.690 0.001
+score FORM_FRAUD_5                          0.136 0.001 0.136 0.001
 score FOUND_YOU                             1.000 1.000 1.000 1.000
-score FREEMAIL_FORGED_FROMDOMAIN            0.249 0.250 0.249 0.250
+score FREEMAIL_FORGED_FROMDOMAIN            0.248 0.250 0.248 0.250
 score FREEM_FRNUM_UNICD_EMPTY               1.000 1.000 1.000 1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB            1.000 1.000 1.000 1.000
-score FROM_2_EMAILS_SHORT                   0.001 0.001 0.001 0.001
-score FROM_ADDR_WS                          2.996 1.283 2.996 1.283
+score FROMSPACE                             2.696 0.001 2.696 0.001
+score FROM_2_EMAILS_SHORT                   2.996 0.001 2.996 0.001
+score FROM_ADDR_WS                          2.996 1.235 2.996 1.235
 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.000 0.001 1.000
 score FROM_FMBLA_NEWDOM14                   0.001 1.000 0.001 1.000
-score FROM_FMBLA_NEWDOM28                   0.001 0.729 0.001 0.729
-score FROM_GOV_DKIM_AU                      0.001 -1.000 0.001 -1.000
+score FROM_FMBLA_NEWDOM28                   0.001 0.799 0.001 0.799
+score FROM_GOV_DKIM_AU                      0.001 -0.999 0.001 -0.999
 score FROM_GOV_REPLYTO_FREEMAIL             0.001 1.000 0.001 1.000
 score FROM_GOV_SPOOF                        0.001 1.000 0.001 1.000
-score FROM_IN_TO_AND_SUBJ                   1.797 0.961 1.797 0.961
-score FROM_MISSPACED                        0.500 0.001 0.500 0.001
+score FROM_IN_TO_AND_SUBJ                   1.797 0.635 1.797 0.635
+score FROM_MISSPACED                        0.518 0.001 0.518 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                   1.534 0.001 1.534 0.001
-score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
-score FROM_MISSP_REPLYTO                    2.403 1.579 2.403 1.579
-score FROM_MISSP_SPF_FAIL                   0.001 0.001 0.001 0.001
+score FROM_MISSP_FREEMAIL                   0.766 0.001 0.766 0.001
+score FROM_MISSP_MSFT                       0.690 0.001 0.690 0.001
+score FROM_MISSP_REPLYTO                    2.497 1.546 2.497 1.546
+score FROM_MISSP_SPF_FAIL                   0.001 0.037 0.001 0.037
 score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
-score FROM_MULTI_NORDNS                     0.001 1.238 0.001 1.238
+score FROM_MULTI_NORDNS                     0.001 1.245 0.001 1.245
 score FROM_NEWDOM_BTC                       0.001 1.000 0.001 1.000
-score FROM_NTLD_LINKBAIT                    0.172 1.000 0.172 1.000
+score FROM_NTLD_LINKBAIT                    0.001 1.000 0.001 1.000
 score FROM_NTLD_REPLY_FREEMAIL              0.001 1.000 0.001 1.000
 score FROM_NUMBERO_NEWDOMAIN                0.001 1.000 0.001 1.000
-score FROM_PAYPAL_SPOOF                     0.001 0.561 0.001 0.561
-score FROM_SUSPICIOUS_NTLD                  0.499 0.001 0.499 0.001
+score FROM_PAYPAL_SPOOF                     0.001 0.050 0.001 0.050
+score FROM_SUSPICIOUS_NTLD                  0.498 0.001 0.498 0.001
 score FROM_SUSPICIOUS_NTLD_FP               1.997 1.999 1.997 1.999
-score FROM_WSP_TRAIL                        2.696 2.499 2.696 2.499
+score FROM_UNBAL1                           2.386 0.001 2.386 0.001
+score FROM_WSP_TRAIL                        2.696 2.599 2.696 2.599
 score FSL_BULK_SIG                          0.001 0.001 0.001 0.001
 score FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
-score FSL_HELO_FAKE                         0.921 0.001 0.921 0.001
+score FSL_HELO_FAKE                         0.465 0.001 0.465 0.001
 score FSL_NEW_HELO_USER                     0.001 0.001 0.001 0.001
 score FUZZY_AMAZON                          0.001 0.001 0.001 0.001
+score FUZZY_SECURITY                        3.096 0.001 3.096 0.001
+score FUZZY_WALLET                          1.997 0.001 1.997 0.001
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
-score GB_CUSTOM_HTM_URI                     0.899 1.499 0.899 1.499
-score GB_FAKE_RF_SHORT                      1.929 1.001 1.929 1.001
+score GB_BITCOIN_CP                         2.996 0.001 2.996 0.001
+score GB_CUSTOM_HTM_URI                     1.498 1.499 1.498 1.499
+score GB_FAKE_RF_SHORT                      1.942 1.725 1.942 1.725
 score GB_FORGED_MUA_POSTFIX                 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO                    0.499 0.001 0.499 0.001
-score GB_FREEMAIL_DISPTO_NOTFREEM           0.498 0.500 0.498 0.500
+score GB_FREEMAIL_DISPTO                    0.498 0.001 0.498 0.001
+score GB_FREEMAIL_DISPTO_NOTFREEM           0.499 0.500 0.499 0.500
 score GB_GOOGLE_OBFUR                       0.750 0.750 0.750 0.750
 score GB_HASHBL_BTC                         0.001 0.001 0.001 0.001
 score GOOGLE_DOCS_PHISH                     1.000 1.000 1.000 1.000
 score GOOGLE_DOCS_PHISH_MANY                1.000 1.000 1.000 1.000
 score GOOGLE_DOC_SUSP                       1.000 1.000 1.000 1.000
 score GOOGLE_DRIVE_REPLY_BAD_NTLD           1.000 1.000 1.000 1.000
-score GOOG_MALWARE_DNLD                     3.749 4.999 3.749 4.999
-score GOOG_REDIR_HTML_ONLY                  1.997 1.999 1.997 1.999
-score GOOG_REDIR_NORDNS                     2.497 3.199 2.497 3.199
+score GOOG_MALWARE_DNLD                     1.387 4.999 1.387 4.999
+score GOOG_REDIR_HTML_ONLY                  1.997 2.000 1.997 2.000
+score GOOG_REDIR_NORDNS                     2.498 3.199 2.498 3.199
 score GOOG_STO_EMAIL_PHISH                  1.000 1.000 1.000 1.000
 score GOOG_STO_HTML_PHISH                   1.000 1.000 1.000 1.000
 score GOOG_STO_HTML_PHISH_MANY              1.000 1.000 1.000 1.000
@@ -160,120 +172,122 @@
 score GOOG_STO_IMG_NOHTML                   1.000 1.000 1.000 1.000
 score GOOG_STO_NOIMG_HTML                   2.996 2.999 2.996 2.999
 score HAS_X_NO_RELAY                        1.000 1.000 1.000 1.000
-score HAS_X_OUTGOING_SPAM_STAT              1.000 0.937 1.000 0.937
-score HDRS_LCASE                            0.100 0.100 0.100 0.100
-score HDRS_MISSP                            2.497 0.740 2.497 0.740
+score HAS_X_OUTGOING_SPAM_STAT              1.000 1.139 1.000 1.139
+score HDRS_MISSP                            2.427 0.741 2.427 0.741
 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.248 0.250 0.248 0.250
+score HEADER_FROM_DIFFERENT_DOMAINS         0.249 0.250 0.249 0.250
 score HELO_NO_DOMAIN                        0.001 0.001 0.001 0.001
 score HEXHASH_WORD                          1.000 1.000 1.000 1.000
 score HK_CTE_RAW                            1.000 1.000 1.000 1.000
 score HK_LOTTO                              0.998 0.001 0.998 0.001
-score HK_NAME_MR_MRS                        0.998 1.000 0.998 1.000
+score HK_NAME_MR_MRS                        0.998 0.999 0.998 0.999
 score HK_RANDOM_ENVFROM                     0.001 0.001 0.001 0.001
 score HK_RANDOM_FROM                        0.998 0.001 0.998 0.001
 score HK_RANDOM_REPLYTO                     0.998 0.999 0.998 0.999
 score HK_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
 score HK_SCAM                               1.997 1.999 1.997 1.999
-score HK_WIN                                0.998 1.000 0.998 1.000
+score HK_WIN                                0.999 1.000 0.999 1.000
 score HOSTED_IMG_DIRECT_MX                  0.001 0.001 0.001 0.001
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
 score HOSTED_IMG_FREEM                      0.001 0.001 0.001 0.001
 score HOSTED_IMG_MULTI                      1.000 1.000 1.000 1.000
 score HOSTED_IMG_MULTI_PUB_01               2.996 2.999 2.996 2.999
-score HTML_ENTITY_ASCII                     2.996 2.939 2.996 2.939
+score HTML_ENTITY_ASCII                     2.996 2.908 2.996 2.908
 score HTML_ENTITY_ASCII_TINY                1.000 1.000 1.000 1.000
 score HTML_FONT_TINY_NORDNS                 1.997 0.001 1.997 0.001
 score HTML_OFF_PAGE                         1.000 0.001 1.000 0.001
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
 score HTML_SINGLET_MANY                     2.497 2.499 2.497 2.499
-score HTML_TAG_BALANCE_CENTER               2.896 2.799 2.896 2.799
-score HTML_TEXT_INVISIBLE_FONT              1.896 1.387 1.896 1.387
-score HTML_TEXT_INVISIBLE_STYLE             0.101 0.001 0.101 0.001
+score HTML_TAG_BALANCE_CENTER               2.896 2.699 2.896 2.699
+score HTML_TEXT_INVISIBLE_FONT              1.737 1.384 1.737 1.384
+score HTML_TEXT_INVISIBLE_STYLE             0.005 0.001 0.005 0.001
 score IMG_ONLY_FM_DOM_INFO                  2.497 1.000 2.497 1.000
 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.698 0.001 0.698 0.001
 score KHOP_HELO_FCRDNS                      0.398 0.001 0.398 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                   0.962 1.000 0.962 1.000
+score LIST_PRTL_SAME_USER                   2.267 1.000 2.267 1.000
 score LONGLN_LOW_CONTRAST                   2.497 0.001 2.497 0.001
-score LONG_HEX_URI                          2.996 3.000 2.996 3.000
+score LONG_HEX_URI                          2.996 2.999 2.996 2.999
 score LONG_IMG_URI                          0.001 0.001 0.001 0.001
-score LONG_INVISIBLE_TEXT                   1.250 0.001 1.250 0.001
+score LONG_INVISIBLE_TEXT                   1.244 0.001 1.244 0.001
 score LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
-score LOTTO_DEPT                            1.997 1.999 1.997 1.999
+score LOTTO_DEPT                            1.997 2.000 1.997 2.000
 score LUCRATIVE                             1.000 1.000 1.000 1.000
 score MALF_HTML_B64                         1.000 1.000 1.000 1.000
 score MALWARE_NORDNS                        0.001 0.001 0.001 0.001
-score MALWARE_PASSWORD                      0.358 1.645 0.358 1.645
-score MANY_HDRS_LCASE                       0.099 0.100 0.099 0.100
+score MALWARE_PASSWORD                      0.342 1.523 0.342 1.523
+score MALW_ATTACH                           2.297 0.001 2.297 0.001
+score MANY_HDRS_LCASE                       0.078 0.100 0.078 0.100
 score MANY_SPAN_IN_TEXT                     2.097 2.199 2.097 2.199
 score MILLION_HUNDRED                       0.001 0.001 0.001 0.001
-score MILLION_USD                           0.423 0.550 0.423 0.550
+score MILLION_USD                           0.257 0.560 0.257 0.560
 score MIMEOLE_DIRECT_TO_MX                  0.001 0.001 0.001 0.001
 score MIME_NO_TEXT                          1.000 1.000 1.000 1.000
 score MIXED_AREA_CASE                       1.000 1.000 1.000 1.000
 score MIXED_CENTER_CASE                     1.000 1.000 1.000 1.000
-score MIXED_ES                              2.297 1.899 2.297 1.899
+score MIXED_ES                              2.197 1.899 2.197 1.899
 score MIXED_FONT_CASE                       1.000 1.000 1.000 1.000
 score MIXED_HREF_CASE                       1.000 1.000 1.000 1.000
-score MIXED_IMG_CASE                        1.218 1.000 1.218 1.000
+score MIXED_IMG_CASE                        1.192 1.000 1.192 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_ATM_CARD                        0.001 0.001 0.001 0.001
+score MONEY_ATM_CARD                        0.635 0.001 0.635 0.001
 score MONEY_FORM                            0.001 0.001 0.001 0.001
-score MONEY_FORM_SHORT                      0.001 0.001 0.001 0.001
+score MONEY_FORM_SHORT                      0.327 0.001 0.327 0.001
 score MONEY_FRAUD_3                         0.001 0.001 0.001 0.001
 score MONEY_FRAUD_5                         0.001 0.001 0.001 0.001
 score MONEY_FRAUD_8                         0.001 0.001 0.001 0.001
-score MONEY_FREEMAIL_REPTO                  2.996 1.432 2.996 1.432
+score MONEY_FREEMAIL_REPTO                  2.996 1.435 2.996 1.435
 score MONEY_FROM_41                         1.997 1.000 1.997 1.000
 score MONEY_FROM_MISSP                      0.001 0.001 0.001 0.001
 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 MSMAIL_PRI_ABNORMAL                   1.312 1.288 1.312 1.288
+score MSMAIL_PRI_ABNORMAL                   1.125 1.499 1.125 1.499
 score MSM_PRIO_REPTO                        2.497 1.000 2.497 1.000
 score NA_DOLLARS                            1.498 1.499 1.498 1.499
 score NEWEGG_IMG_NOT_RCVD_NEGG              1.000 1.000 1.000 1.000
 score NEW_PRODUCTS                          1.000 1.000 1.000 1.000
-score NICE_REPLY_A                          -0.001 -0.101 -0.001 -0.101
-score NO_FM_NAME_IP_HOSTN                   0.001 0.174 0.001 0.174
+score NICE_REPLY_A                          -2.137 -0.092 -2.137 -0.092
+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 2.017 0.001 2.017
-score NUMBERONLY_BITCOIN_EXP                0.001 1.041 0.001 1.041
+score NSL_RCVD_HELO_USER                    0.001 1.573 0.001 1.573
+score NUMBERONLY_BITCOIN_EXP                1.465 1.771 1.465 1.771
 score OBFU_BITCOIN                          1.000 1.000 1.000 1.000
-score OBFU_TEXT_ATTACH                      1.398 0.732 1.398 0.732
-score ODD_FREEM_REPTO                       2.996 2.511 2.996 2.511
-score PDS_BTC_ID                            0.498 0.499 0.498 0.499
+score OBFU_JVSCR_ESC                        2.696 0.001 2.696 0.001
+score OBFU_TEXT_ATTACH                      1.498 0.722 1.498 0.722
+score ODD_FREEM_REPTO                       2.996 2.503 2.996 2.503
+score PDS_BTC_ID                            0.499 0.454 0.499 0.454
 score PDS_BTC_MSGID                         0.001 0.001 0.001 0.001
 score PDS_DBL_URL_TNB_RUNON                 1.997 1.000 1.997 1.000
-score PDS_EMPTYSUBJ_URISHRT                 1.498 1.499 1.498 1.499
-score PDS_FRNOM_TODOM_DBL_URL               1.498 1.499 1.498 1.499
+score PDS_EMPTYSUBJ_URISHRT                 1.498 0.802 1.498 0.802
+score PDS_FRNOM_TODOM_DBL_URL               1.499 1.499 1.499 1.499
 score PDS_FRNOM_TODOM_NAKED_TO              1.498 1.499 1.498 1.499
-score PDS_FROM_2_EMAILS                     0.574 1.857 0.574 1.857
+score PDS_FROM_2_EMAILS                     0.432 1.855 0.432 1.855
 score PDS_FROM_NAME_TO_DOMAIN               1.997 1.999 1.997 1.999
 score PDS_HELO_SPF_FAIL                     0.001 1.000 0.001 1.000
-score PDS_HP_HELO_NORDNS                    0.001 0.001 0.001 0.001
-score PDS_NAKED_TO_NUMERO                   0.510 0.732 0.510 0.732
-score PDS_OTHER_BAD_TLD                     1.997 0.001 1.997 0.001
+score PDS_HP_HELO_NORDNS                    0.158 0.001 0.158 0.001
+score PDS_NAKED_TO_NUMERO                   1.997 1.752 1.997 1.752
+score PDS_OTHER_BAD_TLD                     1.942 0.001 1.942 0.001
 score PDS_SHORTFWD_URISHRT_FP               1.498 1.499 1.498 1.499
-score PDS_TINYSUBJ_URISHRT                  1.262 1.499 1.262 1.499
-score PDS_TO_EQ_FROM_NAME                   1.733 0.001 1.733 0.001
+score PDS_TINYSUBJ_URISHRT                  1.498 1.499 1.498 1.499
+score PDS_TO_EQ_FROM_NAME                   1.742 0.001 1.742 0.001
 score PHISH_AZURE_CLOUDAPP                  3.500 3.500 3.500 3.500
 score PHISH_FBASEAPP                        1.000 1.000 1.000 1.000
 score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT                       2.497 2.089 2.497 2.089
-score PHP_SCRIPT                            2.497 2.359 2.497 2.359
+score PHP_ORIG_SCRIPT                       2.497 2.094 2.497 2.094
+score PHP_SCRIPT                            2.497 2.158 2.497 2.158
 score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT               0.999 0.001 0.999 0.001
+score PP_MIME_FAKE_ASCII_TEXT               0.998 0.001 0.998 0.001
 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                              0.998 1.000 0.998 1.000
+score PUMPDUMP                              1.000 1.000 1.000 1.000
 score PUMPDUMP_MULTI                        1.000 1.000 1.000 1.000
 score RAND_HEADER_LIST_SPOOF                1.000 1.000 1.000 1.000
 score RAND_HEADER_MANY                      1.000 1.000 1.000 1.000
@@ -281,14 +295,24 @@
 score RATWARE_NO_RDNS                       0.001 0.001 0.001 0.001
 score RCVD_DOTEDU_SHORT                     1.000 1.000 1.000 1.000
 score RCVD_DOTEDU_SUSP_URI                  1.000 1.000 1.000 1.000
+score RCVD_IN_MSPIKE_BL                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_H2                     0.001 -0.001 0.001 -0.001
+score RCVD_IN_MSPIKE_H3                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_H4                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_H5                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L2                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L3                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L4                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L5                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_WL                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_ZBI                    0.001 0.001 0.001 0.001
 score RDNS_NUM_TLD_ATCHNX                   1.000 1.000 1.000 1.000
 score RDNS_NUM_TLD_XM                       1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD                       1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL                   1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL_LOOSE             1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_CNS                   1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_GM                    2.996 1.000 2.996 1.000
+score REPTO_419_FRAUD_GM                    2.996 2.999 2.996 2.999
 score REPTO_419_FRAUD_GM_LOOSE              0.998 1.000 0.998 1.000
 score REPTO_419_FRAUD_HM                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_OL                    1.000 1.000 1.000 1.000
@@ -299,61 +323,64 @@
 score REPTO_419_FRAUD_YJ                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_YN                    1.000 1.000 1.000 1.000
 score REPTO_INFONUMSCOM                     1.000 1.000 1.000 1.000
-score SCC_BODY_SINGLE_WORD                  0.851 0.001 0.851 0.001
-score SCC_BODY_URI_ONLY                     1.252 1.439 1.252 1.439
-score SCC_CANSPAM_2                         3.695 2.899 3.695 2.899
+score RISK_FREE                             1.163 0.001 1.163 0.001
+score SCC_BODY_URI_ONLY                     1.539 1.439 1.539 1.439
+score SCC_CANSPAM_2                         3.695 2.900 3.695 2.900
 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.498 1.500 1.498 1.500
-score SCC_NEWBIE_HASBEENS                   2.696 1.427 2.696 1.427
-score SENDGRID_REDIR                        1.498 1.064 1.498 1.064
+score SCC_ISEMM_LID_1B                      1.498 1.499 1.498 1.499
+score SCC_NEWBIE_HASBEENS                   2.696 2.079 2.696 2.079
+score SCC_SPAMMER_ADDR_2                    0.861 0.001 0.861 0.001
+score SENDGRID_REDIR                        1.498 1.067 1.498 1.067
 score SENDGRID_REDIR_PHISH                  1.000 1.000 1.000 1.000
 score SEO_SUSP_NTLD                         1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_PORN014                2.292 0.001 2.292 0.001
-score SERGIO_SUBJECT_VIAGRA01               2.138 2.751 2.138 2.751
-score SHOPIFY_IMG_NOT_RCVD_SFY              2.038 2.499 2.038 2.499
-score SHORTENER_SHORT_IMG                   1.387 1.115 1.387 1.115
+score SERGIO_SUBJECT_PORN014                2.269 0.001 2.269 0.001
+score SERGIO_SUBJECT_VIAGRA01               2.056 2.917 2.056 2.917
+score SHOPIFY_IMG_NOT_RCVD_SFY              2.094 2.499 2.094 2.499
+score SHORTENER_SHORT_IMG                   0.669 1.108 0.669 1.108
 score SHORT_IMG_SUSP_NTLD                   1.000 1.000 1.000 1.000
 score SHORT_SHORTNER                        1.997 2.000 1.997 2.000
 score SPOOFED_FREEMAIL                      0.001 0.001 0.001 0.001
-score SPOOFED_FREEMAIL_NO_RDNS              0.178 0.001 0.178 0.001
+score SPOOFED_FREEMAIL_NO_RDNS              0.475 0.001 0.475 0.001
 score SPOOFED_FREEM_REPTO                   0.001 0.001 0.001 0.001
 score SPOOFED_FREEM_REPTO_CHN               0.001 1.000 0.001 1.000
 score SPOOFED_FREEM_REPTO_RUS               0.001 1.000 0.001 1.000
-score SPOOF_GMAIL_MID                       1.499 0.001 1.499 0.001
-score STATIC_XPRIO_OLE                      1.770 1.999 1.770 1.999
+score SPOOF_GMAIL_MID                       1.498 0.001 1.498 0.001
+score STATIC_XPRIO_OLE                      0.025 1.999 0.025 1.999
 score STOCK_TIP                             1.000 1.000 1.000 1.000
 score SUBJ_BRKN_WORDNUMS                    1.000 1.000 1.000 1.000
-score SUBJ_BROKEN_WORD                      0.218 1.461 0.218 1.461
+score SUBJ_BROKEN_WORD                      0.848 2.299 0.848 2.299
+score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
 score SUSP_UTF8_WORD_COMBO                  2.996 2.999 2.996 2.999
 score SUSP_UTF8_WORD_FROM                   1.997 1.999 1.997 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.498 1.799 1.498 1.799
+score THIS_AD                               1.498 1.800 1.498 1.800
 score THIS_IS_ADV_SUSP_NTLD                 1.000 1.000 1.000 1.000
 score TONLINE_FAKE_DKIM                     1.000 1.000 1.000 1.000
-score TONOM_EQ_TOLOC_SHRT_SHRTNER           1.498 1.499 1.498 1.499
-score TO_EQ_FM_DIRECT_MX                    0.001 2.049 0.001 2.049
-score TO_EQ_FM_DOM_HTML_IMG                 3.995 2.499 3.995 2.499
-score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.585 0.001 0.585
-score TO_EQ_FM_HTML_ONLY                    0.247 1.411 0.247 1.411
-score TO_EQ_FM_SPF_FAIL                     0.001 0.001 0.001 0.001
+score TONOM_EQ_TOLOC_SHRT_SHRTNER           1.499 1.499 1.499 1.499
+score TO_EQ_FM_DIRECT_MX                    0.001 2.106 0.001 2.106
+score TO_EQ_FM_DOM_HTML_IMG                 3.995 2.500 3.995 2.500
+score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
+score TO_EQ_FM_HTML_ONLY                    0.001 1.527 0.001 1.527
+score TO_EQ_FM_SPF_FAIL                     0.001 0.294 0.001 0.294
 score TO_IN_SUBJ                            0.098 0.099 0.098 0.099
-score TO_NAME_SUBJ_NO_RDNS                  2.108 2.947 2.108 2.947
+score TO_NAME_SUBJ_NO_RDNS                  1.853 2.999 1.853 2.999
 score TO_NO_BRKTS_FROM_MSSP                 2.497 2.499 2.497 2.499
 score TO_NO_BRKTS_HTML_IMG                  1.997 1.999 1.997 1.999
-score TO_NO_BRKTS_HTML_ONLY                 1.997 2.000 1.997 2.000
-score TO_NO_BRKTS_MSFT                      1.848 1.391 1.848 1.391
-score TO_NO_BRKTS_NORDNS_HTML               1.582 1.999 1.582 1.999
-score TO_NO_BRKTS_PCNT                      2.497 2.499 2.497 2.499
-score TVD_IP_HEX                            2.896 2.499 2.896 2.499
+score TO_NO_BRKTS_HTML_ONLY                 1.997 1.999 1.997 1.999
+score TO_NO_BRKTS_MSFT                      1.756 1.394 1.756 1.394
+score TO_NO_BRKTS_NORDNS_HTML               1.870 1.999 1.870 1.999
+score TO_NO_BRKTS_PCNT                      2.497 2.500 2.497 2.500
+score TVD_ENHANCE                           2.497 0.001 2.497 0.001
+score TVD_IP_HEX                            2.896 2.233 2.896 2.233
 score TVD_SPACE_ENCODED                     2.497 0.001 2.497 0.001
-score TVD_SPACE_RATIO_MINFP                 1.099 0.001 1.099 0.001
+score TVD_SPACE_RATIO_MINFP                 0.776 0.001 0.776 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.996 2.599 2.996 2.599
-score UNDISC_MONEY                          3.096 2.899 3.096 2.899
+score UNDISC_FREEM                          2.896 2.599 2.896 2.599
+score UNDISC_MONEY                          3.296 2.899 3.296 2.899
 score UNICODE_OBFU_ASC                      2.497 2.499 2.497 2.499
 score UNICODE_OBFU_ZW                       1.000 1.000 1.000 1.000
 score UNSUB_GOOG_FORM                       1.000 1.000 1.000 1.000
@@ -361,32 +388,32 @@
 score URI_AZURE_CLOUDAPP                    1.000 1.000 1.000 1.000
 score URI_DASHGOVEDU                        1.000 1.000 1.000 1.000
 score URI_DATA                              1.000 1.000 1.000 1.000
-score URI_DOTEDU                            1.997 1.999 1.997 1.999
+score URI_DOTEDU                            1.997 2.000 1.997 2.000
 score URI_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
 score URI_FIREBASEAPP                       1.000 1.000 1.000 1.000
-score URI_GOOGLE_PROXY                      2.297 2.299 2.297 2.299
-score URI_GOOG_STO_SPAMMY                   2.996 2.999 2.996 2.999
+score URI_GOOGLE_PROXY                      2.297 2.399 2.297 2.399
+score URI_GOOG_STO_SPAMMY                   2.996 3.000 2.996 3.000
 score URI_HEX_IP                            1.000 1.000 1.000 1.000
 score URI_IMG_WP_REDIR                      1.000 1.000 1.000 1.000
 score URI_LONG_REPEAT                       1.000 1.000 1.000 1.000
-score URI_ONLY_MSGID_MALF                   0.001 0.001 0.001 0.001
+score URI_ONLY_MSGID_MALF                   0.377 1.999 0.377 1.999
 score URI_OPTOUT_3LD                        1.000 1.000 1.000 1.000
 score URI_PHISH                             3.995 3.999 3.995 3.999
 score URI_PHP_REDIR                         3.496 1.000 3.496 1.000
 score URI_TRY_3LD                           1.997 1.999 1.997 1.999
 score URI_TRY_USME                          1.000 1.000 1.000 1.000
 score URI_WP_DIRINDEX                       1.000 1.000 1.000 1.000
-score URI_WP_HACKED                         2.109 1.000 2.109 1.000
+score URI_WP_HACKED                         2.087 1.000 2.087 1.000
 score URI_WP_HACKED_2                       2.497 2.499 2.497 2.499
 score USB_DRIVES                            1.000 1.000 1.000 1.000
-score VFY_ACCT_NORDNS                       2.964 2.999 2.964 2.999
+score VFY_ACCT_NORDNS                       2.853 2.999 2.853 2.999
 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.585 2.734 1.585 2.734
+score WORD_INVIS                            1.581 2.732 1.581 2.732
 score WORD_INVIS_MANY                       2.996 2.999 2.996 2.999
 score XM_DIGITS_ONLY                        1.000 1.000 1.000 1.000
-score XM_RANDOM                             1.000 0.001 1.000 0.001
+score XM_RANDOM                             1.320 0.001 1.320 0.001
 score XM_RECPTID                            2.996 2.999 2.996 2.999
-score XPRIO                                 0.351 0.001 0.351 0.001
+score XPRIO                                 0.001 0.001 0.001 0.001
 score XPRIO_SHORT_SUBJ                      1.000 1.000 1.000 1.000
-score YOUR_PERMISSION                       2.596 2.153 2.596 2.153
+score YOUR_PERMISSION                       2.497 2.048 2.497 2.048
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index c665ce1..20ca57b 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,93 +1,95 @@
-# Using score set 0 logs for revision 1911323 from:
-# ham-ena-week0.r1911323.log ham-ena-week1.r1911323.log ham-ena-week2.r1911323.log ham-ena-week3.r1911323.log ham-ena-week4.r1911323.log ham-giovanni-ham.r1911323.log ham-giovanni-spammy.r1911323.log ham-giovanni-spam.r1911323.log ham-grenier.r1911323.log ham-hege.r1911323.log ham-jhardin.r1911323.log ham-llanga.r1911323.log ham-mmiroslaw-mails-ham.r1911323.log ham-mmiroslaw-mails-spam.r1911323.log ham-spamsponge.r1911323.log ham-thendrikx.r1911323.log ham-tsz-corpus.r1911323.log ham-whyscream.r1911323.log spam-ena-week0.r1911323.log spam-ena-week1.r1911323.log spam-ena-week2.r1911323.log spam-ena-week3.r1911323.log spam-ena-week4.r1911323.log spam-giovanni-ham.r1911323.log spam-giovanni-spammy.r1911323.log spam-giovanni-spam.r1911323.log spam-grenier.r1911323.log spam-hege.r1911323.log spam-jhardin.r1911323.log spam-llanga.r1911323.log spam-mmiroslaw-mails-ham.r1911323.log spam-mmiroslaw-mails-spam.r1911323.log spam-spamsponge.r1911323.log spam-thendrikx.r1911323.log spam-tsz-corpus.r1911323.log spam-whyscream.r1911323.log
+# Using score set 0 logs for revision 1911365 from:
+# ham-ena-week0.r1911365.log ham-ena-week1.r1911365.log ham-ena-week2.r1911365.log ham-ena-week3.r1911365.log ham-ena-week4.r1911365.log ham-giovanni-ham.r1911365.log ham-giovanni-spammy.r1911365.log ham-giovanni-spam.r1911365.log ham-grenier.r1911365.log ham-hege.r1911365.log ham-jhardin.r1911365.log ham-llanga.r1911365.log ham-mmiroslaw-mails-ham.r1911365.log ham-mmiroslaw-mails-spam.r1911365.log ham-spamsponge.r1911365.log ham-thendrikx.r1911365.log ham-tsz-corpus.r1911365.log ham-whyscream.r1911365.log spam-ena-week0.r1911365.log spam-ena-week1.r1911365.log spam-ena-week2.r1911365.log spam-ena-week3.r1911365.log spam-ena-week4.r1911365.log spam-giovanni-ham.r1911365.log spam-giovanni-spammy.r1911365.log spam-giovanni-spam.r1911365.log spam-grenier.r1911365.log spam-hege.r1911365.log spam-jhardin.r1911365.log spam-llanga.r1911365.log spam-mmiroslaw-mails-ham.r1911365.log spam-mmiroslaw-mails-spam.r1911365.log spam-spamsponge.r1911365.log spam-thendrikx.r1911365.log spam-tsz-corpus.r1911365.log spam-whyscream.r1911365.log
 
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.996
 score AC_HTML_NONSENSE_TAGS          1.997
 score ADMITS_SPAM                    2.896
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.754
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
 score ADVANCE_FEE_2_NEW_MONEY        1.997
 score ADVANCE_FEE_3_NEW              3.496
 score ADVANCE_FEE_3_NEW_MONEY        0.001
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        2.315
-score ADVANCE_FEE_5_NEW_FRM_MNY      1.200
+score ADVANCE_FEE_4_NEW_MONEY        2.480
+score ADVANCE_FEE_5_NEW_FRM_MNY      2.896
 score ADVANCE_FEE_5_NEW_MONEY        0.001
 score AD_PREFS                       0.001
-score AMAZON_IMG_NOT_RCVD_AMZN       0.451
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.001 # force non-zero
+score AMAZON_IMG_NOT_RCVD_AMZN       0.535
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
 score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.001
 score AXB_XM_FORGED_OL2600           0.001
 score BIGNUM_EMAILS_FREEM            0.001
 score BIGNUM_EMAILS_MANY             2.996
-score BITCOIN_DEADLINE               2.704
-score BITCOIN_EXTORT_01              4.094
+score BITCOIN_DEADLINE               2.996
+score BITCOIN_EXTORT_01              4.254
 score BITCOIN_MALF_HTML              3.496
-score BITCOIN_MALWARE                0.750
-score BITCOIN_SPAM_02                0.994
-score BITCOIN_SPAM_07                0.789
-score BITCOIN_XPRIO                  0.397
+score BITCOIN_MALWARE                0.906
+score BITCOIN_SPAM_02                1.005
+score BITCOIN_SPAM_07                0.323
+score BITCOIN_XPRIO                  0.571
 score BITCOIN_YOUR_INFO              2.996
 score BODY_EMAIL_419_FRAUD_GM        0.001
 score BODY_SINGLE_URI                2.497
-score BODY_SINGLE_WORD               0.895
-score BODY_URI_ONLY                  2.261
-score BOGUS_MIME_VERSION             3.496
+score BODY_SINGLE_WORD               1.746
+score BODY_URI_ONLY                  2.029
+score BOGUS_MIME_VERSION             2.706
 score CK_HELO_GENERIC                0.248
-score COMPENSATION                   0.001
+score COMPENSATION                   0.144
 score CTE_8BIT_MISMATCH              0.998
-score DEAR_BENEFICIARY               0.001
+score DEAR_BENEFICIARY               2.450
 score DOS_BODY_HIGH_NO_MID           2.696
 score DSN_NO_MIMEVERSION             1.997
-score DYNAMIC_IMGUR                  2.955
+score DYNAMIC_IMGUR                  1.725
 score ENCRYPTED_MESSAGE              -0.998
 score END_FUTURE_EMAILS              2.497
-score FAKE_REPLY_B                   1.767
+score FAKE_REPLY_B                   1.755
 score FILL_THIS_FORM                 1.098
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_LONG_LINE           2.996
-score FONT_INVIS_MSGID               1.934
-score FONT_INVIS_POSTEXTRAS          3.313
+score FONT_INVIS_MSGID               1.943
+score FONT_INVIS_POSTEXTRAS          2.753
 score FORM_FRAUD                     0.998
-score FORM_FRAUD_3                   0.001
-score FORM_FRAUD_5                   0.903
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROMSPACE                      2.796
-score FROM_2_EMAILS_SHORT            0.001
+score FORM_FRAUD_3                   2.690
+score FORM_FRAUD_5                   0.136
+score FREEMAIL_FORGED_FROMDOMAIN     0.248
+score FROMSPACE                      2.696
+score FROM_2_EMAILS_SHORT            2.996
 score FROM_ADDR_WS                   2.996
 score FROM_IN_TO_AND_SUBJ            1.797
-score FROM_MISSPACED                 0.500
+score FROM_MISSPACED                 0.518
 score FROM_MISSP_DYNIP               0.001
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            1.534
-score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_REPLYTO             2.403
+score FROM_MISSP_FREEMAIL            0.766
+score FROM_MISSP_MSFT                0.690
+score FROM_MISSP_REPLYTO             2.497
 score FROM_MISSP_USER                0.001
 score FROM_MULTI_NORDNS              0.001
-score FROM_NTLD_LINKBAIT             0.172
+score FROM_NTLD_LINKBAIT             0.001
 score FROM_NTLD_REPLY_FREEMAIL       0.001
-score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_SUSPICIOUS_NTLD           0.498
 score FROM_SUSPICIOUS_NTLD_FP        1.997
-score FROM_UNBAL1                    1.436
+score FROM_UNBAL1                    2.386
 score FROM_WSP_TRAIL                 2.696
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  0.921
+score FSL_HELO_FAKE                  0.465
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   0.001
 score FUZZY_SECURITY                 3.096
-score GB_CUSTOM_HTM_URI              0.899
-score GB_FAKE_RF_SHORT               1.929
-score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
-score GOOG_MALWARE_DNLD              3.749
+score FUZZY_WALLET                   1.997
+score GB_BITCOIN_CP                  2.996
+score GB_CUSTOM_HTM_URI              1.498
+score GB_FAKE_RF_SHORT               1.942
+score GB_FREEMAIL_DISPTO             0.498
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
+score GOOG_MALWARE_DNLD              1.387
 score GOOG_REDIR_HTML_ONLY           1.997
-score GOOG_REDIR_NORDNS              2.497
+score GOOG_REDIR_NORDNS              2.498
 score GOOG_STO_NOIMG_HTML            2.996
-score HDRS_MISSP                     2.497
+score HDRS_MISSP                     2.427
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.248
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.998
 score HK_NAME_MR_MRS                 0.998
@@ -95,7 +97,7 @@
 score HK_RANDOM_FROM                 0.998
 score HK_RANDOM_REPLYTO              0.998
 score HK_SCAM                        1.997
-score HK_WIN                         0.998
+score HK_WIN                         0.999
 score HOSTED_IMG_DIRECT_MX           0.001
 score HOSTED_IMG_FREEM               0.001
 score HOSTED_IMG_MULTI_PUB_01        2.996
@@ -103,126 +105,123 @@
 score HTML_FONT_TINY_NORDNS          1.997
 score HTML_SINGLET_MANY              2.497
 score HTML_TAG_BALANCE_CENTER        2.896
-score HTML_TEXT_INVISIBLE_FONT       1.896
-score HTML_TEXT_INVISIBLE_STYLE      0.101
+score HTML_TEXT_INVISIBLE_FONT       1.737
+score HTML_TEXT_INVISIBLE_STYLE      0.005
 score IMG_ONLY_FM_DOM_INFO           2.497
+score KHOP_FAKE_EBAY                 0.698
 score KHOP_HELO_FCRDNS               0.398
-score LIST_PRTL_SAME_USER            0.962
+score LIST_PRTL_SAME_USER            2.267
 score LONGLN_LOW_CONTRAST            2.497
 score LONG_HEX_URI                   2.996
 score LONG_IMG_URI                   0.001
-score LONG_INVISIBLE_TEXT            1.250
+score LONG_INVISIBLE_TEXT            1.244
 score LOTS_OF_MONEY                  0.010
 score LOTTO_DEPT                     1.997
 score MALWARE_NORDNS                 0.001
-score MALWARE_PASSWORD               0.358
+score MALWARE_PASSWORD               0.342
 score MALW_ATTACH                    2.297
-score MANY_HDRS_LCASE                0.099
+score MANY_HDRS_LCASE                0.078
 score MANY_SPAN_IN_TEXT              2.097
-score MAY_BE_FORGED                  1.597
 score MILLION_HUNDRED                0.001
-score MILLION_USD                    0.423
+score MILLION_USD                    0.257
 score MIMEOLE_DIRECT_TO_MX           0.001
-score MIXED_ES                       2.297
-score MIXED_IMG_CASE                 1.218
-score MONEY_ATM_CARD                 0.001
+score MIXED_ES                       2.197
+score MIXED_IMG_CASE                 1.192
+score MONEY_ATM_CARD                 0.635
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               0.001
+score MONEY_FORM_SHORT               0.327
 score MONEY_FRAUD_3                  0.001
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
 score MONEY_FREEMAIL_REPTO           2.996
 score MONEY_FROM_41                  1.997
 score MONEY_FROM_MISSP               0.001
-score MSMAIL_PRI_ABNORMAL            1.312
+score MSMAIL_PRI_ABNORMAL            1.125
 score MSM_PRIO_REPTO                 2.497
 score NA_DOLLARS                     1.498
-score NICE_REPLY_A                   -0.001
+score NICE_REPLY_A                   -2.137
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBERONLY_BITCOIN_EXP         0.001
+score NUMBERONLY_BITCOIN_EXP         1.465
 score OBFU_JVSCR_ESC                 2.696
-score OBFU_TEXT_ATTACH               1.398
+score OBFU_TEXT_ATTACH               1.498
 score ODD_FREEM_REPTO                2.996
-score PDS_BTC_ID                     0.498
+score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.001
 score PDS_DBL_URL_TNB_RUNON          1.997
 score PDS_EMPTYSUBJ_URISHRT          1.498
-score PDS_FRNOM_TODOM_DBL_URL        1.498
+score PDS_FRNOM_TODOM_DBL_URL        1.499
 score PDS_FRNOM_TODOM_NAKED_TO       1.498
-score PDS_FROM_2_EMAILS              0.574
+score PDS_FROM_2_EMAILS              0.432
 score PDS_FROM_NAME_TO_DOMAIN        1.997
-score PDS_HP_HELO_NORDNS             0.001
-score PDS_NAKED_TO_NUMERO            0.510
-score PDS_OTHER_BAD_TLD              1.997
+score PDS_HP_HELO_NORDNS             0.158
+score PDS_NAKED_TO_NUMERO            1.997
+score PDS_OTHER_BAD_TLD              1.942
 score PDS_SHORTFWD_URISHRT_FP        1.498
-score PDS_TINYSUBJ_URISHRT           1.262
-score PDS_TO_EQ_FROM_NAME            1.733
+score PDS_TINYSUBJ_URISHRT           1.498
+score PDS_TO_EQ_FROM_NAME            1.742
 score PHP_ORIG_SCRIPT                2.497
 score PHP_SCRIPT                     2.497
-score PP_MIME_FAKE_ASCII_TEXT        0.999
-score PUMPDUMP                       0.998
+score PP_MIME_FAKE_ASCII_TEXT        0.998
 score RAND_MKTG_HEADER               1.997
 score RATWARE_NO_RDNS                0.001
 score REPTO_419_FRAUD_GM             2.996
 score REPTO_419_FRAUD_GM_LOOSE       0.998
-score RISK_FREE                      1.174
-score SCC_BODY_SINGLE_WORD           0.851
-score SCC_BODY_URI_ONLY              1.252
+score RISK_FREE                      1.163
+score SCC_BODY_URI_ONLY              1.539
 score SCC_CANSPAM_2                  3.695
 score SCC_ISEMM_LID_1B               1.498
 score SCC_NEWBIE_HASBEENS            2.696
-score SCC_SPAMMER_ADDR_2             1.399
+score SCC_SPAMMER_ADDR_2             0.861
 score SENDGRID_REDIR                 1.498
-score SERGIO_SUBJECT_PORN014         2.292
-score SERGIO_SUBJECT_VIAGRA01        2.138
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.038
-score SHORTENER_SHORT_IMG            1.387
+score SERGIO_SUBJECT_PORN014         2.269
+score SERGIO_SUBJECT_VIAGRA01        2.056
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.094
+score SHORTENER_SHORT_IMG            0.669
 score SHORT_SHORTNER                 1.997
-score SPOOFED_FREEMAIL_NO_RDNS       0.178
-score SPOOF_GMAIL_MID                1.499
-score STATIC_XPRIO_OLE               1.770
-score SUBJ_BROKEN_WORD               0.218
+score SPOOFED_FREEMAIL_NO_RDNS       0.475
+score SPOOF_GMAIL_MID                1.498
+score STATIC_XPRIO_OLE               0.025
+score SUBJ_BROKEN_WORD               0.848
 score SUSP_UTF8_WORD_COMBO           2.996
 score SUSP_UTF8_WORD_FROM            1.997
 score THIS_AD                        1.498
-score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.498
+score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.499
 score TO_EQ_FM_DIRECT_MX             0.001
 score TO_EQ_FM_DOM_HTML_IMG          3.995
-score TO_EQ_FM_HTML_ONLY             0.247
+score TO_EQ_FM_HTML_ONLY             0.001
 score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.108
+score TO_NAME_SUBJ_NO_RDNS           1.853
 score TO_NO_BRKTS_FROM_MSSP          2.497
 score TO_NO_BRKTS_HTML_IMG           1.997
 score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_MSFT               1.848
-score TO_NO_BRKTS_NORDNS_HTML        1.582
+score TO_NO_BRKTS_MSFT               1.756
+score TO_NO_BRKTS_NORDNS_HTML        1.870
 score TO_NO_BRKTS_PCNT               2.497
 score TVD_ENHANCE                    2.497
 score TVD_IP_HEX                     2.896
 score TVD_SPACE_ENCODED              2.497
-score TVD_SPACE_RATIO_MINFP          1.099
-score UNDISC_FREEM                   2.996
-score UNDISC_MONEY                   3.096
+score TVD_SPACE_RATIO_MINFP          0.776
+score UNDISC_FREEM                   2.896
+score UNDISC_MONEY                   3.296
 score UNICODE_OBFU_ASC               2.497
 score URI_DOTEDU                     1.997
 score URI_GOOGLE_PROXY               2.297
 score URI_GOOG_STO_SPAMMY            2.996
-score URI_ONLY_MSGID_MALF            0.001
+score URI_ONLY_MSGID_MALF            0.377
 score URI_PHISH                      3.995
 score URI_PHP_REDIR                  3.496
 score URI_TRY_3LD                    1.997
-score URI_WPADMIN                    2.297
-score URI_WP_HACKED                  2.109
+score URI_WP_HACKED                  2.087
 score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                2.964
-score WORD_INVIS                     1.585
+score VFY_ACCT_NORDNS                2.853
+score WORD_INVIS                     1.581
 score WORD_INVIS_MANY                2.996
-score XM_RANDOM                      1.000
+score XM_RANDOM                      1.320
 score XM_RECPTID                     2.996
-score XPRIO                          0.351
-score YOUR_PERMISSION                2.596
+score XPRIO                          0.001
+score YOUR_PERMISSION                2.497
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -290,7 +289,6 @@
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 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
@@ -326,6 +324,7 @@
 score PHP_SCRIPT_MUA                 1.000
 score PP_TOO_MUCH_UNICODE02          0.500
 score PP_TOO_MUCH_UNICODE05          1.000
+score PUMPDUMP                       1.000
 score PUMPDUMP_MULTI                 1.000
 score RAND_HEADER_LIST_SPOOF         1.000
 score RAND_HEADER_MANY               1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index ee0c71f..620fab1 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -7,199 +7,199 @@
 score AC_HTML_NONSENSE_TAGS          1.999
 score ADMITS_SPAM                    0.001
 score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.264
-score ADVANCE_FEE_3_NEW_MONEY        0.001
-score ADVANCE_FEE_4_NEW_MONEY        0.552
+score ADVANCE_FEE_3_NEW              3.265
+score ADVANCE_FEE_3_NEW_MONEY        0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY        0.549
 score ADVANCE_FEE_5_NEW_FRM_MNY      2.999
-score ADVANCE_FEE_5_NEW_MONEY        0.685
-score AD_PREFS                       0.296
-score AMAZON_IMG_NOT_RCVD_AMZN       0.001
+score ADVANCE_FEE_5_NEW_MONEY        0.686
+score AD_PREFS                       0.395
+score AMAZON_IMG_NOT_RCVD_AMZN       0.001 # force non-zero
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score BITCOIN_DEADLINE               2.563
-score BITCOIN_EXTORT_01              2.359
+score BITCOIN_DEADLINE               2.628
+score BITCOIN_EXTORT_01              2.302
 score BITCOIN_MALF_HTML              3.499
-score BITCOIN_MALWARE                0.164
-score BITCOIN_SPAM_02                0.227
-score BITCOIN_SPAM_05                2.205
+score BITCOIN_MALWARE                0.191
+score BITCOIN_SPAM_02                0.274
+score BITCOIN_SPAM_05                2.168
 score BITCOIN_SPAM_07                0.001
-score BITCOIN_XPRIO                  0.190
-score BITCOIN_YOUR_INFO              2.999
-score BODY_SINGLE_URI                2.500
-score BODY_SINGLE_WORD               0.001 # force non-zero
-score BODY_URI_ONLY                  1.185
+score BITCOIN_XPRIO                  0.271
+score BITCOIN_YOUR_INFO              3.000
+score BODY_SINGLE_URI                2.499
+score BODY_SINGLE_WORD               0.001
+score BODY_URI_ONLY                  1.188
 score CK_HELO_GENERIC                0.249
 score CTE_8BIT_MISMATCH              0.001
-score DEAR_BENEFICIARY               0.001 # force non-zero
+score DEAR_BENEFICIARY               0.001
 score DKIMWL_BL                      2.999
 score DKIMWL_WL_HIGH                 -0.001
 score DKIMWL_WL_MED                  -0.001
 score DKIMWL_WL_MEDHI                -0.001
 score DOS_BODY_HIGH_NO_MID           0.001
 score END_FUTURE_EMAILS              2.499
-score FILL_THIS_FORM                 0.899
+score FILL_THIS_FORM                 1.000
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_LONG_LINE           2.999
 score FONT_INVIS_MSGID               0.001
-score FONT_INVIS_POSTEXTRAS          3.087
+score FONT_INVIS_POSTEXTRAS          3.084
 score FORGED_SPF_HELO                2.199
-score FORM_FRAUD_5                   0.001 # force non-zero
+score FORM_FRAUD_5                   0.001
 score FREEMAIL_FORGED_FROMDOMAIN     0.250
 score FROM_2_EMAILS_SHORT            0.001
-score FROM_ADDR_WS                   1.283
-score FROM_FMBLA_NEWDOM28            0.729
-score FROM_GOV_DKIM_AU               -1.000
-score FROM_IN_TO_AND_SUBJ            0.961
+score FROM_ADDR_WS                   1.235
+score FROM_FMBLA_NEWDOM28            0.799
+score FROM_GOV_DKIM_AU               -0.999
+score FROM_IN_TO_AND_SUBJ            0.635
 score FROM_MISSPACED                 0.001
 score FROM_MISSP_EH_MATCH            0.001
 score FROM_MISSP_FREEMAIL            0.001
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_REPLYTO             1.579
-score FROM_MISSP_SPF_FAIL            0.001
+score FROM_MISSP_REPLYTO             1.546
+score FROM_MISSP_SPF_FAIL            0.037
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              1.238
-score FROM_PAYPAL_SPOOF              0.561
+score FROM_MULTI_NORDNS              1.245
+score FROM_PAYPAL_SPOOF              0.050
 score FROM_SUSPICIOUS_NTLD           0.001
 score FROM_SUSPICIOUS_NTLD_FP        1.999
-score FROM_WSP_TRAIL                 2.499
+score FROM_WSP_TRAIL                 2.599
 score FSL_BULK_SIG                   0.001
 score FSL_CTYPE_WIN1251              0.001
 score FSL_HELO_FAKE                  0.001
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   0.001
 score GB_CUSTOM_HTM_URI              1.499
-score GB_FAKE_RF_SHORT               1.001
+score GB_FAKE_RF_SHORT               1.725
 score GB_FREEMAIL_DISPTO             0.001
 score GB_HASHBL_BTC                  0.001
 score GOOG_MALWARE_DNLD              4.999
-score GOOG_REDIR_HTML_ONLY           1.999
+score GOOG_REDIR_HTML_ONLY           2.000
 score GOOG_REDIR_NORDNS              3.199
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       0.937
-score HDRS_MISSP                     0.740
+score HAS_X_OUTGOING_SPAM_STAT       1.139
+score HDRS_MISSP                     0.741
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
 score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.001
-score HK_NAME_MR_MRS                 1.000
+score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.001
-score HK_RANDOM_FROM                 0.001 # force non-zero
+score HK_RANDOM_FROM                 0.001
 score HK_RANDOM_REPLYTO              0.999
 score HK_SCAM                        1.999
 score HOSTED_IMG_DIRECT_MX           0.001
 score HOSTED_IMG_FREEM               0.001
 score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_ENTITY_ASCII              2.939
+score HTML_ENTITY_ASCII              2.908
 score HTML_FONT_TINY_NORDNS          0.001
 score HTML_OFF_PAGE                  0.001
 score HTML_SINGLET_MANY              2.499
-score HTML_TAG_BALANCE_CENTER        2.799
-score HTML_TEXT_INVISIBLE_FONT       1.387
+score HTML_TAG_BALANCE_CENTER        2.699
+score HTML_TEXT_INVISIBLE_FONT       1.384
 score HTML_TEXT_INVISIBLE_STYLE      0.001
 score KHOP_HELO_FCRDNS               0.001 # force non-zero
 score LONGLN_LOW_CONTRAST            0.001
-score LONG_HEX_URI                   3.000
+score LONG_HEX_URI                   2.999
 score LONG_IMG_URI                   0.001
 score LONG_INVISIBLE_TEXT            0.001
 score LOTS_OF_MONEY                  0.010
-score LOTTO_DEPT                     1.999
-score MALWARE_NORDNS                 0.001 # force non-zero
-score MALWARE_PASSWORD               1.645
+score LOTTO_DEPT                     2.000
+score MALWARE_NORDNS                 0.001
+score MALWARE_PASSWORD               1.523
 score MANY_SPAN_IN_TEXT              2.199
 score MILLION_HUNDRED                0.001
-score MILLION_USD                    0.550
+score MILLION_USD                    0.560
 score MIMEOLE_DIRECT_TO_MX           0.001
 score MIXED_ES                       1.899
 score MONEY_ATM_CARD                 0.001
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               0.001
+score MONEY_FORM_SHORT               0.001 # force non-zero
 score MONEY_FRAUD_3                  0.001
 score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.432
+score MONEY_FRAUD_8                  0.001 # force non-zero
+score MONEY_FREEMAIL_REPTO           1.435
 score MONEY_FROM_MISSP               0.001
-score MSMAIL_PRI_ABNORMAL            1.288
+score MSMAIL_PRI_ABNORMAL            1.499
 score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -0.101
-score NO_FM_NAME_IP_HOSTN            0.174
+score NICE_REPLY_A                   -0.092
+score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             2.017
-score NUMBERONLY_BITCOIN_EXP         1.041
-score OBFU_TEXT_ATTACH               0.732
-score ODD_FREEM_REPTO                2.511
-score PDS_BTC_ID                     0.499
-score PDS_BTC_MSGID                  0.001
-score PDS_EMPTYSUBJ_URISHRT          1.499
+score NSL_RCVD_HELO_USER             1.573
+score NUMBERONLY_BITCOIN_EXP         1.771
+score OBFU_TEXT_ATTACH               0.722
+score ODD_FREEM_REPTO                2.503
+score PDS_BTC_ID                     0.454
+score PDS_BTC_MSGID                  0.001 # force non-zero
+score PDS_EMPTYSUBJ_URISHRT          0.802
 score PDS_FRNOM_TODOM_DBL_URL        1.499
 score PDS_FRNOM_TODOM_NAKED_TO       1.499
-score PDS_FROM_2_EMAILS              1.857
+score PDS_FROM_2_EMAILS              1.855
 score PDS_FROM_NAME_TO_DOMAIN        1.999
 score PDS_HP_HELO_NORDNS             0.001
-score PDS_NAKED_TO_NUMERO            0.732
+score PDS_NAKED_TO_NUMERO            1.752
 score PDS_OTHER_BAD_TLD              0.001
 score PDS_SHORTFWD_URISHRT_FP        1.499
 score PDS_TINYSUBJ_URISHRT           1.499
 score PDS_TO_EQ_FROM_NAME            0.001
-score PHP_ORIG_SCRIPT                2.089
-score PHP_SCRIPT                     2.359
+score PHP_ORIG_SCRIPT                2.094
+score PHP_SCRIPT                     2.158
 score PP_MIME_FAKE_ASCII_TEXT        0.001
-score RAND_MKTG_HEADER               0.001
+score RAND_MKTG_HEADER               0.001 # force non-zero
 score RATWARE_NO_RDNS                0.001
 score RCVD_IN_MSPIKE_H2              -0.001
-score SCC_BODY_SINGLE_WORD           0.001 # force non-zero
+score REPTO_419_FRAUD_GM             2.999
 score SCC_BODY_URI_ONLY              1.439
-score SCC_CANSPAM_2                  2.899
-score SCC_ISEMM_LID_1B               1.500
-score SCC_NEWBIE_HASBEENS            1.427
-score SENDGRID_REDIR                 1.064
-score SERGIO_SUBJECT_PORN014         0.001
-score SERGIO_SUBJECT_VIAGRA01        2.751
+score SCC_CANSPAM_2                  2.900
+score SCC_ISEMM_LID_1B               1.499
+score SCC_NEWBIE_HASBEENS            2.079
+score SENDGRID_REDIR                 1.067
+score SERGIO_SUBJECT_PORN014         0.001 # force non-zero
+score SERGIO_SUBJECT_VIAGRA01        2.917
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
-score SHORTENER_SHORT_IMG            1.115
+score SHORTENER_SHORT_IMG            1.108
 score SHORT_SHORTNER                 2.000
 score SPOOFED_FREEMAIL               0.001
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            0.001
 score SPOOF_GMAIL_MID                0.001
 score STATIC_XPRIO_OLE               1.999
-score SUBJ_BROKEN_WORD               1.461
+score SUBJ_BROKEN_WORD               2.299
 score SUSP_UTF8_WORD_COMBO           2.999
 score SUSP_UTF8_WORD_FROM            1.999
-score THIS_AD                        1.799
+score THIS_AD                        1.800
 score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.499
-score TO_EQ_FM_DIRECT_MX             2.049
-score TO_EQ_FM_DOM_HTML_IMG          2.499
-score TO_EQ_FM_DOM_SPF_FAIL          0.585
-score TO_EQ_FM_HTML_ONLY             1.411
-score TO_EQ_FM_SPF_FAIL              0.001
+score TO_EQ_FM_DIRECT_MX             2.106
+score TO_EQ_FM_DOM_HTML_IMG          2.500
+score TO_EQ_FM_DOM_SPF_FAIL          0.001
+score TO_EQ_FM_HTML_ONLY             1.527
+score TO_EQ_FM_SPF_FAIL              0.294
 score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           2.947
+score TO_NAME_SUBJ_NO_RDNS           2.999
 score TO_NO_BRKTS_FROM_MSSP          2.499
 score TO_NO_BRKTS_HTML_IMG           1.999
-score TO_NO_BRKTS_HTML_ONLY          2.000
-score TO_NO_BRKTS_MSFT               1.391
+score TO_NO_BRKTS_HTML_ONLY          1.999
+score TO_NO_BRKTS_MSFT               1.394
 score TO_NO_BRKTS_NORDNS_HTML        1.999
-score TO_NO_BRKTS_PCNT               2.499
-score TVD_IP_HEX                     2.499
+score TO_NO_BRKTS_PCNT               2.500
+score TVD_IP_HEX                     2.233
 score TVD_SPACE_ENCODED              0.001
 score TVD_SPACE_RATIO_MINFP          0.001
 score UNDISC_FREEM                   2.599
 score UNDISC_MONEY                   2.899
 score UNICODE_OBFU_ASC               2.499
-score URI_DOTEDU                     1.999
-score URI_GOOGLE_PROXY               2.299
-score URI_GOOG_STO_SPAMMY            2.999
-score URI_ONLY_MSGID_MALF            0.001
+score URI_DOTEDU                     2.000
+score URI_GOOGLE_PROXY               2.399
+score URI_GOOG_STO_SPAMMY            3.000
+score URI_ONLY_MSGID_MALF            1.999
 score URI_PHISH                      3.999
 score URI_TRY_3LD                    1.999
 score URI_WP_HACKED_2                2.499
 score VFY_ACCT_NORDNS                2.999
-score WORD_INVIS                     2.734
+score WORD_INVIS                     2.732
 score WORD_INVIS_MANY                2.999
 score XM_RANDOM                      0.001
 score XM_RECPTID                     2.999
-score XPRIO                          0.001
-score YOUR_PERMISSION                2.153
+score XPRIO                          0.001 # force non-zero
+score YOUR_PERMISSION                2.048
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -289,7 +289,6 @@
 score GOOG_STO_IMG_HTML              1.000
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 1.000
-score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
@@ -345,7 +344,6 @@
 score REPTO_419_FRAUD_AOL            1.000
 score REPTO_419_FRAUD_AOL_LOOSE      1.000
 score REPTO_419_FRAUD_CNS            1.000
-score REPTO_419_FRAUD_GM             1.000
 score REPTO_419_FRAUD_GM_LOOSE       1.000
 score REPTO_419_FRAUD_HM             1.000
 score REPTO_419_FRAUD_OL             1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index c665ce1..20ca57b 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,93 +1,95 @@
-# Using score set 0 logs for revision 1911323 from:
-# ham-ena-week0.r1911323.log ham-ena-week1.r1911323.log ham-ena-week2.r1911323.log ham-ena-week3.r1911323.log ham-ena-week4.r1911323.log ham-giovanni-ham.r1911323.log ham-giovanni-spammy.r1911323.log ham-giovanni-spam.r1911323.log ham-grenier.r1911323.log ham-hege.r1911323.log ham-jhardin.r1911323.log ham-llanga.r1911323.log ham-mmiroslaw-mails-ham.r1911323.log ham-mmiroslaw-mails-spam.r1911323.log ham-spamsponge.r1911323.log ham-thendrikx.r1911323.log ham-tsz-corpus.r1911323.log ham-whyscream.r1911323.log spam-ena-week0.r1911323.log spam-ena-week1.r1911323.log spam-ena-week2.r1911323.log spam-ena-week3.r1911323.log spam-ena-week4.r1911323.log spam-giovanni-ham.r1911323.log spam-giovanni-spammy.r1911323.log spam-giovanni-spam.r1911323.log spam-grenier.r1911323.log spam-hege.r1911323.log spam-jhardin.r1911323.log spam-llanga.r1911323.log spam-mmiroslaw-mails-ham.r1911323.log spam-mmiroslaw-mails-spam.r1911323.log spam-spamsponge.r1911323.log spam-thendrikx.r1911323.log spam-tsz-corpus.r1911323.log spam-whyscream.r1911323.log
+# Using score set 0 logs for revision 1911365 from:
+# ham-ena-week0.r1911365.log ham-ena-week1.r1911365.log ham-ena-week2.r1911365.log ham-ena-week3.r1911365.log ham-ena-week4.r1911365.log ham-giovanni-ham.r1911365.log ham-giovanni-spammy.r1911365.log ham-giovanni-spam.r1911365.log ham-grenier.r1911365.log ham-hege.r1911365.log ham-jhardin.r1911365.log ham-llanga.r1911365.log ham-mmiroslaw-mails-ham.r1911365.log ham-mmiroslaw-mails-spam.r1911365.log ham-spamsponge.r1911365.log ham-thendrikx.r1911365.log ham-tsz-corpus.r1911365.log ham-whyscream.r1911365.log spam-ena-week0.r1911365.log spam-ena-week1.r1911365.log spam-ena-week2.r1911365.log spam-ena-week3.r1911365.log spam-ena-week4.r1911365.log spam-giovanni-ham.r1911365.log spam-giovanni-spammy.r1911365.log spam-giovanni-spam.r1911365.log spam-grenier.r1911365.log spam-hege.r1911365.log spam-jhardin.r1911365.log spam-llanga.r1911365.log spam-mmiroslaw-mails-ham.r1911365.log spam-mmiroslaw-mails-spam.r1911365.log spam-spamsponge.r1911365.log spam-thendrikx.r1911365.log spam-tsz-corpus.r1911365.log spam-whyscream.r1911365.log
 
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.996
 score AC_HTML_NONSENSE_TAGS          1.997
 score ADMITS_SPAM                    2.896
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.754
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
 score ADVANCE_FEE_2_NEW_MONEY        1.997
 score ADVANCE_FEE_3_NEW              3.496
 score ADVANCE_FEE_3_NEW_MONEY        0.001
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        2.315
-score ADVANCE_FEE_5_NEW_FRM_MNY      1.200
+score ADVANCE_FEE_4_NEW_MONEY        2.480
+score ADVANCE_FEE_5_NEW_FRM_MNY      2.896
 score ADVANCE_FEE_5_NEW_MONEY        0.001
 score AD_PREFS                       0.001
-score AMAZON_IMG_NOT_RCVD_AMZN       0.451
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.001 # force non-zero
+score AMAZON_IMG_NOT_RCVD_AMZN       0.535
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
 score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.001
 score AXB_XM_FORGED_OL2600           0.001
 score BIGNUM_EMAILS_FREEM            0.001
 score BIGNUM_EMAILS_MANY             2.996
-score BITCOIN_DEADLINE               2.704
-score BITCOIN_EXTORT_01              4.094
+score BITCOIN_DEADLINE               2.996
+score BITCOIN_EXTORT_01              4.254
 score BITCOIN_MALF_HTML              3.496
-score BITCOIN_MALWARE                0.750
-score BITCOIN_SPAM_02                0.994
-score BITCOIN_SPAM_07                0.789
-score BITCOIN_XPRIO                  0.397
+score BITCOIN_MALWARE                0.906
+score BITCOIN_SPAM_02                1.005
+score BITCOIN_SPAM_07                0.323
+score BITCOIN_XPRIO                  0.571
 score BITCOIN_YOUR_INFO              2.996
 score BODY_EMAIL_419_FRAUD_GM        0.001
 score BODY_SINGLE_URI                2.497
-score BODY_SINGLE_WORD               0.895
-score BODY_URI_ONLY                  2.261
-score BOGUS_MIME_VERSION             3.496
+score BODY_SINGLE_WORD               1.746
+score BODY_URI_ONLY                  2.029
+score BOGUS_MIME_VERSION             2.706
 score CK_HELO_GENERIC                0.248
-score COMPENSATION                   0.001
+score COMPENSATION                   0.144
 score CTE_8BIT_MISMATCH              0.998
-score DEAR_BENEFICIARY               0.001
+score DEAR_BENEFICIARY               2.450
 score DOS_BODY_HIGH_NO_MID           2.696
 score DSN_NO_MIMEVERSION             1.997
-score DYNAMIC_IMGUR                  2.955
+score DYNAMIC_IMGUR                  1.725
 score ENCRYPTED_MESSAGE              -0.998
 score END_FUTURE_EMAILS              2.497
-score FAKE_REPLY_B                   1.767
+score FAKE_REPLY_B                   1.755
 score FILL_THIS_FORM                 1.098
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_LONG_LINE           2.996
-score FONT_INVIS_MSGID               1.934
-score FONT_INVIS_POSTEXTRAS          3.313
+score FONT_INVIS_MSGID               1.943
+score FONT_INVIS_POSTEXTRAS          2.753
 score FORM_FRAUD                     0.998
-score FORM_FRAUD_3                   0.001
-score FORM_FRAUD_5                   0.903
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROMSPACE                      2.796
-score FROM_2_EMAILS_SHORT            0.001
+score FORM_FRAUD_3                   2.690
+score FORM_FRAUD_5                   0.136
+score FREEMAIL_FORGED_FROMDOMAIN     0.248
+score FROMSPACE                      2.696
+score FROM_2_EMAILS_SHORT            2.996
 score FROM_ADDR_WS                   2.996
 score FROM_IN_TO_AND_SUBJ            1.797
-score FROM_MISSPACED                 0.500
+score FROM_MISSPACED                 0.518
 score FROM_MISSP_DYNIP               0.001
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            1.534
-score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_REPLYTO             2.403
+score FROM_MISSP_FREEMAIL            0.766
+score FROM_MISSP_MSFT                0.690
+score FROM_MISSP_REPLYTO             2.497
 score FROM_MISSP_USER                0.001
 score FROM_MULTI_NORDNS              0.001
-score FROM_NTLD_LINKBAIT             0.172
+score FROM_NTLD_LINKBAIT             0.001
 score FROM_NTLD_REPLY_FREEMAIL       0.001
-score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_SUSPICIOUS_NTLD           0.498
 score FROM_SUSPICIOUS_NTLD_FP        1.997
-score FROM_UNBAL1                    1.436
+score FROM_UNBAL1                    2.386
 score FROM_WSP_TRAIL                 2.696
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  0.921
+score FSL_HELO_FAKE                  0.465
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   0.001
 score FUZZY_SECURITY                 3.096
-score GB_CUSTOM_HTM_URI              0.899
-score GB_FAKE_RF_SHORT               1.929
-score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
-score GOOG_MALWARE_DNLD              3.749
+score FUZZY_WALLET                   1.997
+score GB_BITCOIN_CP                  2.996
+score GB_CUSTOM_HTM_URI              1.498
+score GB_FAKE_RF_SHORT               1.942
+score GB_FREEMAIL_DISPTO             0.498
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
+score GOOG_MALWARE_DNLD              1.387
 score GOOG_REDIR_HTML_ONLY           1.997
-score GOOG_REDIR_NORDNS              2.497
+score GOOG_REDIR_NORDNS              2.498
 score GOOG_STO_NOIMG_HTML            2.996
-score HDRS_MISSP                     2.497
+score HDRS_MISSP                     2.427
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
-score HEADER_FROM_DIFFERENT_DOMAINS  0.248
+score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.998
 score HK_NAME_MR_MRS                 0.998
@@ -95,7 +97,7 @@
 score HK_RANDOM_FROM                 0.998
 score HK_RANDOM_REPLYTO              0.998
 score HK_SCAM                        1.997
-score HK_WIN                         0.998
+score HK_WIN                         0.999
 score HOSTED_IMG_DIRECT_MX           0.001
 score HOSTED_IMG_FREEM               0.001
 score HOSTED_IMG_MULTI_PUB_01        2.996
@@ -103,126 +105,123 @@
 score HTML_FONT_TINY_NORDNS          1.997
 score HTML_SINGLET_MANY              2.497
 score HTML_TAG_BALANCE_CENTER        2.896
-score HTML_TEXT_INVISIBLE_FONT       1.896
-score HTML_TEXT_INVISIBLE_STYLE      0.101
+score HTML_TEXT_INVISIBLE_FONT       1.737
+score HTML_TEXT_INVISIBLE_STYLE      0.005
 score IMG_ONLY_FM_DOM_INFO           2.497
+score KHOP_FAKE_EBAY                 0.698
 score KHOP_HELO_FCRDNS               0.398
-score LIST_PRTL_SAME_USER            0.962
+score LIST_PRTL_SAME_USER            2.267
 score LONGLN_LOW_CONTRAST            2.497
 score LONG_HEX_URI                   2.996
 score LONG_IMG_URI                   0.001
-score LONG_INVISIBLE_TEXT            1.250
+score LONG_INVISIBLE_TEXT            1.244
 score LOTS_OF_MONEY                  0.010
 score LOTTO_DEPT                     1.997
 score MALWARE_NORDNS                 0.001
-score MALWARE_PASSWORD               0.358
+score MALWARE_PASSWORD               0.342
 score MALW_ATTACH                    2.297
-score MANY_HDRS_LCASE                0.099
+score MANY_HDRS_LCASE                0.078
 score MANY_SPAN_IN_TEXT              2.097
-score MAY_BE_FORGED                  1.597
 score MILLION_HUNDRED                0.001
-score MILLION_USD                    0.423
+score MILLION_USD                    0.257
 score MIMEOLE_DIRECT_TO_MX           0.001
-score MIXED_ES                       2.297
-score MIXED_IMG_CASE                 1.218
-score MONEY_ATM_CARD                 0.001
+score MIXED_ES                       2.197
+score MIXED_IMG_CASE                 1.192
+score MONEY_ATM_CARD                 0.635
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               0.001
+score MONEY_FORM_SHORT               0.327
 score MONEY_FRAUD_3                  0.001
 score MONEY_FRAUD_5                  0.001
 score MONEY_FRAUD_8                  0.001
 score MONEY_FREEMAIL_REPTO           2.996
 score MONEY_FROM_41                  1.997
 score MONEY_FROM_MISSP               0.001
-score MSMAIL_PRI_ABNORMAL            1.312
+score MSMAIL_PRI_ABNORMAL            1.125
 score MSM_PRIO_REPTO                 2.497
 score NA_DOLLARS                     1.498
-score NICE_REPLY_A                   -0.001
+score NICE_REPLY_A                   -2.137
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
 score NSL_RCVD_HELO_USER             0.001
-score NUMBERONLY_BITCOIN_EXP         0.001
+score NUMBERONLY_BITCOIN_EXP         1.465
 score OBFU_JVSCR_ESC                 2.696
-score OBFU_TEXT_ATTACH               1.398
+score OBFU_TEXT_ATTACH               1.498
 score ODD_FREEM_REPTO                2.996
-score PDS_BTC_ID                     0.498
+score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.001
 score PDS_DBL_URL_TNB_RUNON          1.997
 score PDS_EMPTYSUBJ_URISHRT          1.498
-score PDS_FRNOM_TODOM_DBL_URL        1.498
+score PDS_FRNOM_TODOM_DBL_URL        1.499
 score PDS_FRNOM_TODOM_NAKED_TO       1.498
-score PDS_FROM_2_EMAILS              0.574
+score PDS_FROM_2_EMAILS              0.432
 score PDS_FROM_NAME_TO_DOMAIN        1.997
-score PDS_HP_HELO_NORDNS             0.001
-score PDS_NAKED_TO_NUMERO            0.510
-score PDS_OTHER_BAD_TLD              1.997
+score PDS_HP_HELO_NORDNS             0.158
+score PDS_NAKED_TO_NUMERO            1.997
+score PDS_OTHER_BAD_TLD              1.942
 score PDS_SHORTFWD_URISHRT_FP        1.498
-score PDS_TINYSUBJ_URISHRT           1.262
-score PDS_TO_EQ_FROM_NAME            1.733
+score PDS_TINYSUBJ_URISHRT           1.498
+score PDS_TO_EQ_FROM_NAME            1.742
 score PHP_ORIG_SCRIPT                2.497
 score PHP_SCRIPT                     2.497
-score PP_MIME_FAKE_ASCII_TEXT        0.999
-score PUMPDUMP                       0.998
+score PP_MIME_FAKE_ASCII_TEXT        0.998
 score RAND_MKTG_HEADER               1.997
 score RATWARE_NO_RDNS                0.001
 score REPTO_419_FRAUD_GM             2.996
 score REPTO_419_FRAUD_GM_LOOSE       0.998
-score RISK_FREE                      1.174
-score SCC_BODY_SINGLE_WORD           0.851
-score SCC_BODY_URI_ONLY              1.252
+score RISK_FREE                      1.163
+score SCC_BODY_URI_ONLY              1.539
 score SCC_CANSPAM_2                  3.695
 score SCC_ISEMM_LID_1B               1.498
 score SCC_NEWBIE_HASBEENS            2.696
-score SCC_SPAMMER_ADDR_2             1.399
+score SCC_SPAMMER_ADDR_2             0.861
 score SENDGRID_REDIR                 1.498
-score SERGIO_SUBJECT_PORN014         2.292
-score SERGIO_SUBJECT_VIAGRA01        2.138
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.038
-score SHORTENER_SHORT_IMG            1.387
+score SERGIO_SUBJECT_PORN014         2.269
+score SERGIO_SUBJECT_VIAGRA01        2.056
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.094
+score SHORTENER_SHORT_IMG            0.669
 score SHORT_SHORTNER                 1.997
-score SPOOFED_FREEMAIL_NO_RDNS       0.178
-score SPOOF_GMAIL_MID                1.499
-score STATIC_XPRIO_OLE               1.770
-score SUBJ_BROKEN_WORD               0.218
+score SPOOFED_FREEMAIL_NO_RDNS       0.475
+score SPOOF_GMAIL_MID                1.498
+score STATIC_XPRIO_OLE               0.025
+score SUBJ_BROKEN_WORD               0.848
 score SUSP_UTF8_WORD_COMBO           2.996
 score SUSP_UTF8_WORD_FROM            1.997
 score THIS_AD                        1.498
-score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.498
+score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.499
 score TO_EQ_FM_DIRECT_MX             0.001
 score TO_EQ_FM_DOM_HTML_IMG          3.995
-score TO_EQ_FM_HTML_ONLY             0.247
+score TO_EQ_FM_HTML_ONLY             0.001
 score TO_IN_SUBJ                     0.098
-score TO_NAME_SUBJ_NO_RDNS           2.108
+score TO_NAME_SUBJ_NO_RDNS           1.853
 score TO_NO_BRKTS_FROM_MSSP          2.497
 score TO_NO_BRKTS_HTML_IMG           1.997
 score TO_NO_BRKTS_HTML_ONLY          1.997
-score TO_NO_BRKTS_MSFT               1.848
-score TO_NO_BRKTS_NORDNS_HTML        1.582
+score TO_NO_BRKTS_MSFT               1.756
+score TO_NO_BRKTS_NORDNS_HTML        1.870
 score TO_NO_BRKTS_PCNT               2.497
 score TVD_ENHANCE                    2.497
 score TVD_IP_HEX                     2.896
 score TVD_SPACE_ENCODED              2.497
-score TVD_SPACE_RATIO_MINFP          1.099
-score UNDISC_FREEM                   2.996
-score UNDISC_MONEY                   3.096
+score TVD_SPACE_RATIO_MINFP          0.776
+score UNDISC_FREEM                   2.896
+score UNDISC_MONEY                   3.296
 score UNICODE_OBFU_ASC               2.497
 score URI_DOTEDU                     1.997
 score URI_GOOGLE_PROXY               2.297
 score URI_GOOG_STO_SPAMMY            2.996
-score URI_ONLY_MSGID_MALF            0.001
+score URI_ONLY_MSGID_MALF            0.377
 score URI_PHISH                      3.995
 score URI_PHP_REDIR                  3.496
 score URI_TRY_3LD                    1.997
-score URI_WPADMIN                    2.297
-score URI_WP_HACKED                  2.109
+score URI_WP_HACKED                  2.087
 score URI_WP_HACKED_2                2.497
-score VFY_ACCT_NORDNS                2.964
-score WORD_INVIS                     1.585
+score VFY_ACCT_NORDNS                2.853
+score WORD_INVIS                     1.581
 score WORD_INVIS_MANY                2.996
-score XM_RANDOM                      1.000
+score XM_RANDOM                      1.320
 score XM_RECPTID                     2.996
-score XPRIO                          0.351
-score YOUR_PERMISSION                2.596
+score XPRIO                          0.001
+score YOUR_PERMISSION                2.497
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -290,7 +289,6 @@
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 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
@@ -326,6 +324,7 @@
 score PHP_SCRIPT_MUA                 1.000
 score PP_TOO_MUCH_UNICODE02          0.500
 score PP_TOO_MUCH_UNICODE05          1.000
+score PUMPDUMP                       1.000
 score PUMPDUMP_MULTI                 1.000
 score RAND_HEADER_LIST_SPOOF         1.000
 score RAND_HEADER_MANY               1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index ee0c71f..620fab1 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -7,199 +7,199 @@
 score AC_HTML_NONSENSE_TAGS          1.999
 score ADMITS_SPAM                    0.001
 score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.264
-score ADVANCE_FEE_3_NEW_MONEY        0.001
-score ADVANCE_FEE_4_NEW_MONEY        0.552
+score ADVANCE_FEE_3_NEW              3.265
+score ADVANCE_FEE_3_NEW_MONEY        0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY        0.549
 score ADVANCE_FEE_5_NEW_FRM_MNY      2.999
-score ADVANCE_FEE_5_NEW_MONEY        0.685
-score AD_PREFS                       0.296
-score AMAZON_IMG_NOT_RCVD_AMZN       0.001
+score ADVANCE_FEE_5_NEW_MONEY        0.686
+score AD_PREFS                       0.395
+score AMAZON_IMG_NOT_RCVD_AMZN       0.001 # force non-zero
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score BITCOIN_DEADLINE               2.563
-score BITCOIN_EXTORT_01              2.359
+score BITCOIN_DEADLINE               2.628
+score BITCOIN_EXTORT_01              2.302
 score BITCOIN_MALF_HTML              3.499
-score BITCOIN_MALWARE                0.164
-score BITCOIN_SPAM_02                0.227
-score BITCOIN_SPAM_05                2.205
+score BITCOIN_MALWARE                0.191
+score BITCOIN_SPAM_02                0.274
+score BITCOIN_SPAM_05                2.168
 score BITCOIN_SPAM_07                0.001
-score BITCOIN_XPRIO                  0.190
-score BITCOIN_YOUR_INFO              2.999
-score BODY_SINGLE_URI                2.500
-score BODY_SINGLE_WORD               0.001 # force non-zero
-score BODY_URI_ONLY                  1.185
+score BITCOIN_XPRIO                  0.271
+score BITCOIN_YOUR_INFO              3.000
+score BODY_SINGLE_URI                2.499
+score BODY_SINGLE_WORD               0.001
+score BODY_URI_ONLY                  1.188
 score CK_HELO_GENERIC                0.249
 score CTE_8BIT_MISMATCH              0.001
-score DEAR_BENEFICIARY               0.001 # force non-zero
+score DEAR_BENEFICIARY               0.001
 score DKIMWL_BL                      2.999
 score DKIMWL_WL_HIGH                 -0.001
 score DKIMWL_WL_MED                  -0.001
 score DKIMWL_WL_MEDHI                -0.001
 score DOS_BODY_HIGH_NO_MID           0.001
 score END_FUTURE_EMAILS              2.499
-score FILL_THIS_FORM                 0.899
+score FILL_THIS_FORM                 1.000
 score FONT_INVIS_DIRECT              0.001
 score FONT_INVIS_LONG_LINE           2.999
 score FONT_INVIS_MSGID               0.001
-score FONT_INVIS_POSTEXTRAS          3.087
+score FONT_INVIS_POSTEXTRAS          3.084
 score FORGED_SPF_HELO                2.199
-score FORM_FRAUD_5                   0.001 # force non-zero
+score FORM_FRAUD_5                   0.001
 score FREEMAIL_FORGED_FROMDOMAIN     0.250
 score FROM_2_EMAILS_SHORT            0.001
-score FROM_ADDR_WS                   1.283
-score FROM_FMBLA_NEWDOM28            0.729
-score FROM_GOV_DKIM_AU               -1.000
-score FROM_IN_TO_AND_SUBJ            0.961
+score FROM_ADDR_WS                   1.235
+score FROM_FMBLA_NEWDOM28            0.799
+score FROM_GOV_DKIM_AU               -0.999
+score FROM_IN_TO_AND_SUBJ            0.635
 score FROM_MISSPACED                 0.001
 score FROM_MISSP_EH_MATCH            0.001
 score FROM_MISSP_FREEMAIL            0.001
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_REPLYTO             1.579
-score FROM_MISSP_SPF_FAIL            0.001
+score FROM_MISSP_REPLYTO             1.546
+score FROM_MISSP_SPF_FAIL            0.037
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              1.238
-score FROM_PAYPAL_SPOOF              0.561
+score FROM_MULTI_NORDNS              1.245
+score FROM_PAYPAL_SPOOF              0.050
 score FROM_SUSPICIOUS_NTLD           0.001
 score FROM_SUSPICIOUS_NTLD_FP        1.999
-score FROM_WSP_TRAIL                 2.499
+score FROM_WSP_TRAIL                 2.599
 score FSL_BULK_SIG                   0.001
 score FSL_CTYPE_WIN1251              0.001
 score FSL_HELO_FAKE                  0.001
 score FSL_NEW_HELO_USER              0.001
 score FUZZY_AMAZON                   0.001
 score GB_CUSTOM_HTM_URI              1.499
-score GB_FAKE_RF_SHORT               1.001
+score GB_FAKE_RF_SHORT               1.725
 score GB_FREEMAIL_DISPTO             0.001
 score GB_HASHBL_BTC                  0.001
 score GOOG_MALWARE_DNLD              4.999
-score GOOG_REDIR_HTML_ONLY           1.999
+score GOOG_REDIR_HTML_ONLY           2.000
 score GOOG_REDIR_NORDNS              3.199
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       0.937
-score HDRS_MISSP                     0.740
+score HAS_X_OUTGOING_SPAM_STAT       1.139
+score HDRS_MISSP                     0.741
 score HDR_ORDER_FTSDMCXX_DIRECT      0.001
 score HDR_ORDER_FTSDMCXX_NORDNS      0.001
 score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
 score HK_LOTTO                       0.001
-score HK_NAME_MR_MRS                 1.000
+score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.001
-score HK_RANDOM_FROM                 0.001 # force non-zero
+score HK_RANDOM_FROM                 0.001
 score HK_RANDOM_REPLYTO              0.999
 score HK_SCAM                        1.999
 score HOSTED_IMG_DIRECT_MX           0.001
 score HOSTED_IMG_FREEM               0.001
 score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_ENTITY_ASCII              2.939
+score HTML_ENTITY_ASCII              2.908
 score HTML_FONT_TINY_NORDNS          0.001
 score HTML_OFF_PAGE                  0.001
 score HTML_SINGLET_MANY              2.499
-score HTML_TAG_BALANCE_CENTER        2.799
-score HTML_TEXT_INVISIBLE_FONT       1.387
+score HTML_TAG_BALANCE_CENTER        2.699
+score HTML_TEXT_INVISIBLE_FONT       1.384
 score HTML_TEXT_INVISIBLE_STYLE      0.001
 score KHOP_HELO_FCRDNS               0.001 # force non-zero
 score LONGLN_LOW_CONTRAST            0.001
-score LONG_HEX_URI                   3.000
+score LONG_HEX_URI                   2.999
 score LONG_IMG_URI                   0.001
 score LONG_INVISIBLE_TEXT            0.001
 score LOTS_OF_MONEY                  0.010
-score LOTTO_DEPT                     1.999
-score MALWARE_NORDNS                 0.001 # force non-zero
-score MALWARE_PASSWORD               1.645
+score LOTTO_DEPT                     2.000
+score MALWARE_NORDNS                 0.001
+score MALWARE_PASSWORD               1.523
 score MANY_SPAN_IN_TEXT              2.199
 score MILLION_HUNDRED                0.001
-score MILLION_USD                    0.550
+score MILLION_USD                    0.560
 score MIMEOLE_DIRECT_TO_MX           0.001
 score MIXED_ES                       1.899
 score MONEY_ATM_CARD                 0.001
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               0.001
+score MONEY_FORM_SHORT               0.001 # force non-zero
 score MONEY_FRAUD_3                  0.001
 score MONEY_FRAUD_5                  0.001
-score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           1.432
+score MONEY_FRAUD_8                  0.001 # force non-zero
+score MONEY_FREEMAIL_REPTO           1.435
 score MONEY_FROM_MISSP               0.001
-score MSMAIL_PRI_ABNORMAL            1.288
+score MSMAIL_PRI_ABNORMAL            1.499
 score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -0.101
-score NO_FM_NAME_IP_HOSTN            0.174
+score NICE_REPLY_A                   -0.092
+score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             2.017
-score NUMBERONLY_BITCOIN_EXP         1.041
-score OBFU_TEXT_ATTACH               0.732
-score ODD_FREEM_REPTO                2.511
-score PDS_BTC_ID                     0.499
-score PDS_BTC_MSGID                  0.001
-score PDS_EMPTYSUBJ_URISHRT          1.499
+score NSL_RCVD_HELO_USER             1.573
+score NUMBERONLY_BITCOIN_EXP         1.771
+score OBFU_TEXT_ATTACH               0.722
+score ODD_FREEM_REPTO                2.503
+score PDS_BTC_ID                     0.454
+score PDS_BTC_MSGID                  0.001 # force non-zero
+score PDS_EMPTYSUBJ_URISHRT          0.802
 score PDS_FRNOM_TODOM_DBL_URL        1.499
 score PDS_FRNOM_TODOM_NAKED_TO       1.499
-score PDS_FROM_2_EMAILS              1.857
+score PDS_FROM_2_EMAILS              1.855
 score PDS_FROM_NAME_TO_DOMAIN        1.999
 score PDS_HP_HELO_NORDNS             0.001
-score PDS_NAKED_TO_NUMERO            0.732
+score PDS_NAKED_TO_NUMERO            1.752
 score PDS_OTHER_BAD_TLD              0.001
 score PDS_SHORTFWD_URISHRT_FP        1.499
 score PDS_TINYSUBJ_URISHRT           1.499
 score PDS_TO_EQ_FROM_NAME            0.001
-score PHP_ORIG_SCRIPT                2.089
-score PHP_SCRIPT                     2.359
+score PHP_ORIG_SCRIPT                2.094
+score PHP_SCRIPT                     2.158
 score PP_MIME_FAKE_ASCII_TEXT        0.001
-score RAND_MKTG_HEADER               0.001
+score RAND_MKTG_HEADER               0.001 # force non-zero
 score RATWARE_NO_RDNS                0.001
 score RCVD_IN_MSPIKE_H2              -0.001
-score SCC_BODY_SINGLE_WORD           0.001 # force non-zero
+score REPTO_419_FRAUD_GM             2.999
 score SCC_BODY_URI_ONLY              1.439
-score SCC_CANSPAM_2                  2.899
-score SCC_ISEMM_LID_1B               1.500
-score SCC_NEWBIE_HASBEENS            1.427
-score SENDGRID_REDIR                 1.064
-score SERGIO_SUBJECT_PORN014         0.001
-score SERGIO_SUBJECT_VIAGRA01        2.751
+score SCC_CANSPAM_2                  2.900
+score SCC_ISEMM_LID_1B               1.499
+score SCC_NEWBIE_HASBEENS            2.079
+score SENDGRID_REDIR                 1.067
+score SERGIO_SUBJECT_PORN014         0.001 # force non-zero
+score SERGIO_SUBJECT_VIAGRA01        2.917
 score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
-score SHORTENER_SHORT_IMG            1.115
+score SHORTENER_SHORT_IMG            1.108
 score SHORT_SHORTNER                 2.000
 score SPOOFED_FREEMAIL               0.001
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
 score SPOOFED_FREEM_REPTO            0.001
 score SPOOF_GMAIL_MID                0.001
 score STATIC_XPRIO_OLE               1.999
-score SUBJ_BROKEN_WORD               1.461
+score SUBJ_BROKEN_WORD               2.299
 score SUSP_UTF8_WORD_COMBO           2.999
 score SUSP_UTF8_WORD_FROM            1.999
-score THIS_AD                        1.799
+score THIS_AD                        1.800
 score TONOM_EQ_TOLOC_SHRT_SHRTNER    1.499
-score TO_EQ_FM_DIRECT_MX             2.049
-score TO_EQ_FM_DOM_HTML_IMG          2.499
-score TO_EQ_FM_DOM_SPF_FAIL          0.585
-score TO_EQ_FM_HTML_ONLY             1.411
-score TO_EQ_FM_SPF_FAIL              0.001
+score TO_EQ_FM_DIRECT_MX             2.106
+score TO_EQ_FM_DOM_HTML_IMG          2.500
+score TO_EQ_FM_DOM_SPF_FAIL          0.001
+score TO_EQ_FM_HTML_ONLY             1.527
+score TO_EQ_FM_SPF_FAIL              0.294
 score TO_IN_SUBJ                     0.099
-score TO_NAME_SUBJ_NO_RDNS           2.947
+score TO_NAME_SUBJ_NO_RDNS           2.999
 score TO_NO_BRKTS_FROM_MSSP          2.499
 score TO_NO_BRKTS_HTML_IMG           1.999
-score TO_NO_BRKTS_HTML_ONLY          2.000
-score TO_NO_BRKTS_MSFT               1.391
+score TO_NO_BRKTS_HTML_ONLY          1.999
+score TO_NO_BRKTS_MSFT               1.394
 score TO_NO_BRKTS_NORDNS_HTML        1.999
-score TO_NO_BRKTS_PCNT               2.499
-score TVD_IP_HEX                     2.499
+score TO_NO_BRKTS_PCNT               2.500
+score TVD_IP_HEX                     2.233
 score TVD_SPACE_ENCODED              0.001
 score TVD_SPACE_RATIO_MINFP          0.001
 score UNDISC_FREEM                   2.599
 score UNDISC_MONEY                   2.899
 score UNICODE_OBFU_ASC               2.499
-score URI_DOTEDU                     1.999
-score URI_GOOGLE_PROXY               2.299
-score URI_GOOG_STO_SPAMMY            2.999
-score URI_ONLY_MSGID_MALF            0.001
+score URI_DOTEDU                     2.000
+score URI_GOOGLE_PROXY               2.399
+score URI_GOOG_STO_SPAMMY            3.000
+score URI_ONLY_MSGID_MALF            1.999
 score URI_PHISH                      3.999
 score URI_TRY_3LD                    1.999
 score URI_WP_HACKED_2                2.499
 score VFY_ACCT_NORDNS                2.999
-score WORD_INVIS                     2.734
+score WORD_INVIS                     2.732
 score WORD_INVIS_MANY                2.999
 score XM_RANDOM                      0.001
 score XM_RECPTID                     2.999
-score XPRIO                          0.001
-score YOUR_PERMISSION                2.153
+score XPRIO                          0.001 # force non-zero
+score YOUR_PERMISSION                2.048
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000
@@ -289,7 +289,6 @@
 score GOOG_STO_IMG_HTML              1.000
 score GOOG_STO_IMG_NOHTML            1.000
 score HAS_X_NO_RELAY                 1.000
-score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
@@ -345,7 +344,6 @@
 score REPTO_419_FRAUD_AOL            1.000
 score REPTO_419_FRAUD_AOL_LOOSE      1.000
 score REPTO_419_FRAUD_CNS            1.000
-score REPTO_419_FRAUD_GM             1.000
 score REPTO_419_FRAUD_GM_LOOSE       1.000
 score REPTO_419_FRAUD_HM             1.000
 score REPTO_419_FRAUD_OL             1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 361505f..befb2af 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: 391676  52.411%  (99.198% of non-spam corpus)
-# Correctly spam:     185688  24.847%  (52.681% of spam corpus)
-# False positives:      3165  0.424%  (0.802% of nonspam,  96572 weighted)
-# False negatives:    166785  22.318%  (47.319% of spam, 346110 weighted)
-# Average score for spam:  6.8    nonspam: 0.7
-# Average for false-pos:   6.8  false-neg: 2.1
-# TOTAL:              747314  100.00%
+# Correctly non-spam: 392342  51.563%  (99.161% of non-spam corpus)
+# Correctly spam:     196618  25.840%  (53.833% of spam corpus)
+# False positives:      3321  0.436%  (0.839% of nonspam, 101960 weighted)
+# False negatives:    168621  22.161%  (46.167% of spam, 347350 weighted)
+# Average score for spam:  6.9    nonspam: 0.6
+# Average for false-pos:   6.7  false-neg: 2.1
+# TOTAL:              760902  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  48835  99.16%
-# Correctly spam:      23224  52.85%
-# False positives:       415  0.84%
-# False negatives:     20723  47.15%
-# TCR(l=50): 1.059653  SpamRecall: 52.845%  SpamPrec: 98.244%
+# Correctly non-spam:  48909  99.09%
+# Correctly spam:      24531  53.88%
+# False positives:       447  0.91%
+# False negatives:     20997  46.12%
+# TCR(l=50): 1.050315  SpamRecall: 53.881%  SpamPrec: 98.210%
 
 ##### 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: 386247  97.82%
-# Correctly spam:     120996  34.33%
-# False positives:      8594  2.18%
-# False negatives:    231477  65.67%
-# TCR(l=50): 0.533099  SpamRecall: 34.328%  SpamPrec: 93.368%
+# Correctly non-spam: 387112  97.84%
+# Correctly spam:     126947  34.76%
+# False positives:      8551  2.16%
+# False negatives:    238292  65.24%
+# TCR(l=50): 0.548537  SpamRecall: 34.757%  SpamPrec: 93.689%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  48134  97.73%
-# Correctly spam:      15177  34.53%
-# False positives:      1116  2.27%
-# False negatives:     28770  65.47%
-# TCR(l=50): 0.519652  SpamRecall: 34.535%  SpamPrec: 93.150%
+# Correctly non-spam:  48235  97.73%
+# Correctly spam:      16011  35.17%
+# False positives:      1121  2.27%
+# False negatives:     29517  64.83%
+# TCR(l=50): 0.532074  SpamRecall: 35.167%  SpamPrec: 93.457%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index d15fa4e..c69107b 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,23 +1,23 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 368639  76.677%  (98.963% of non-spam corpus)
-# Correctly spam:      76808  15.976%  (70.942% of spam corpus)
-# False positives:      3861  0.803%  (1.037% of nonspam, 130471 weighted)
-# False negatives:     31460  6.544%  (29.058% of spam,  29543 weighted)
-# Average score for spam:  13.2    nonspam: -0.4
+# Correctly non-spam: 368646  76.679%  (98.965% of non-spam corpus)
+# Correctly spam:      76832  15.981%  (70.965% of spam corpus)
+# False positives:      3854  0.802%  (1.035% of nonspam, 130360 weighted)
+# False negatives:     31435  6.539%  (29.035% of spam,  29475 weighted)
+# Average score for spam:  13.3    nonspam: -0.4
 # Average for false-pos:   11.6  false-neg: 0.9
-# TOTAL:              480768  100.00%
+# TOTAL:              480767  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  45869  98.87%
-# Correctly spam:       9697  70.95%
-# False positives:       522  1.13%
-# False negatives:      3971  29.05%
-# TCR(l=50): 0.454524  SpamRecall: 70.947%  SpamPrec: 94.892%
+# Correctly non-spam:  45870  98.88%
+# Correctly spam:       9681  70.83%
+# False positives:       521  1.12%
+# False negatives:      3987  29.17%
+# TCR(l=50): 0.455039  SpamRecall: 70.830%  SpamPrec: 94.893%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam: 369207  99.12%
-# Correctly spam:      65270  60.29%
+# Correctly spam:      65285  60.30%
 # False positives:      3293  0.88%
-# False negatives:     42998  39.71%
-# TCR(l=50): 0.521402  SpamRecall: 60.286%  SpamPrec: 95.197%
+# False negatives:     42982  39.70%
+# TCR(l=50): 0.521437  SpamRecall: 60.300%  SpamPrec: 95.198%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam:  45947  99.04%
-# Correctly spam:       8291  60.66%
+# Correctly spam:       8276  60.55%
 # False positives:       444  0.96%
-# False negatives:      5377  39.34%
-# TCR(l=50): 0.495630  SpamRecall: 60.660%  SpamPrec: 94.917%
+# False negatives:      5392  39.45%
+# TCR(l=50): 0.495361  SpamRecall: 60.550%  SpamPrec: 94.908%