updated scores for revision 1883740 active rules added since last mass-check
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1883811 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index d46de95..6e9720a 100644
--- a/rulesrc/scores/72_scores.cf
+++ b/rulesrc/scores/72_scores.cf
@@ -1,7 +1,7 @@
score AC_BR_BONANZA 0.001 0.001 0.001 0.001
score AC_DIV_BONANZA 0.001 0.001 0.001 0.001
-score AC_FROM_MANY_DOTS 2.999 0.640 2.999 0.640
-score AC_HTML_NONSENSE_TAGS 1.999 2.000 1.999 2.000
+score AC_FROM_MANY_DOTS 2.999 0.649 2.999 0.649
+score AC_HTML_NONSENSE_TAGS 1.999 1.999 1.999 1.999
score AC_POST_EXTRAS 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000 1.000 1.000 1.000
@@ -13,34 +13,34 @@
score AC_SPAMMY_URI_PATTERNS8 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS9 1.000 1.000 1.000 1.000
score ADVANCE_FEE_2_NEW_FORM 1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_MONEY 1.173 0.001 1.173 0.001
-score ADVANCE_FEE_3_NEW 2.598 3.467 2.598 3.467
-score ADVANCE_FEE_3_NEW_MONEY 0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW 2.499 0.001 2.499 0.001
-score ADVANCE_FEE_5_NEW 3.199 2.999 3.199 2.999
+score ADVANCE_FEE_2_NEW_MONEY 1.172 0.001 1.172 0.001
+score ADVANCE_FEE_3_NEW 2.601 3.468 2.601 3.468
+score ADVANCE_FEE_3_NEW_MONEY 0.292 0.019 0.292 0.019
+score ADVANCE_FEE_4_NEW 2.599 0.001 2.599 0.001
+score ADVANCE_FEE_5_NEW 3.199 2.897 3.199 2.897
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 0.001 0.001 0.001
score ADVANCE_FEE_5_NEW_MONEY 2.290 0.001 2.290 0.001
score AD_PREFS 0.250 0.250 0.250 0.250
-score ALIBABA_IMG_NOT_RCVD_ALI 2.499 2.500 2.499 2.500
+score ALIBABA_IMG_NOT_RCVD_ALI 2.499 2.499 2.499 2.499
score AMAZON_IMG_NOT_RCVD_AMZN 2.499 1.000 2.499 1.000
score APP_DEVELOPMENT_FREEM 1.000 1.000 1.000 1.000
-score APP_DEVELOPMENT_NORDNS 1.618 1.000 1.618 1.000
+score APP_DEVELOPMENT_NORDNS 1.625 1.000 1.625 1.000
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.580 1.283 2.580 1.283
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.366 0.481 2.366 0.481
score BITCOIN_BOMB 1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE 2.999 0.898 2.999 0.898
-score BITCOIN_EXTORT_01 2.101 3.334 2.101 3.334
+score BITCOIN_DEADLINE 2.999 0.852 2.999 0.852
+score BITCOIN_EXTORT_01 2.111 3.399 2.111 3.399
score BITCOIN_EXTORT_02 1.000 1.000 1.000 1.000
score BITCOIN_MALF_HTML 3.499 3.499 3.499 3.499
score BITCOIN_MALWARE 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 2.401 2.499 2.401 2.499
+score BITCOIN_SPAM_02 2.406 2.499 2.406 2.499
score BITCOIN_SPAM_03 2.499 2.499 2.499 2.499
score BITCOIN_SPAM_04 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_05 0.001 2.499 0.001 2.499
score BITCOIN_SPAM_06 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07 3.482 1.842 3.482 1.842
+score BITCOIN_SPAM_07 3.320 2.857 3.320 2.857
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
@@ -48,13 +48,13 @@
score BITCOIN_SPAM_12 1.000 1.000 1.000 1.000
score BITCOIN_SPF_ONLYALL 0.001 1.000 0.001 1.000
score BITCOIN_XPRIO 0.001 0.001 0.001 0.001
-score BITCOIN_YOUR_INFO 1.102 0.001 1.102 0.001
+score BITCOIN_YOUR_INFO 0.001 0.001 0.001 0.001
score BODY_EMPTY 1.999 1.999 1.999 1.999
-score BODY_SINGLE_URI 2.499 2.500 2.499 2.500
-score BODY_SINGLE_WORD 0.303 0.001 0.303 0.001
-score BODY_URI_ONLY 1.499 1.499 1.499 1.499
+score BODY_SINGLE_URI 2.499 2.499 2.499 2.499
+score BODY_SINGLE_WORD 0.301 0.001 0.301 0.001
+score BODY_URI_ONLY 1.500 1.499 1.500 1.499
score BOGUS_MIME_VERSION 3.499 3.499 3.499 3.499
-score BOGUS_MSM_HDRS 0.821 2.172 0.821 2.172
+score BOGUS_MSM_HDRS 0.520 1.525 0.520 1.525
score BOMB_FREEM 1.000 1.000 1.000 1.000
score BOMB_MONEY 1.000 1.000 1.000 1.000
score BTC_ORG 1.000 1.000 1.000 1.000
@@ -76,62 +76,62 @@
score DSN_NO_MIMEVERSION 1.999 1.999 1.999 1.999
score EBAY_IMG_NOT_RCVD_EBAY 1.000 1.000 1.000 1.000
score ENCRYPTED_MESSAGE -1.000 -1.000 -1.000 -1.000
-score END_FUTURE_EMAILS 1.935 1.000 1.935 1.000
-score FAKE_REPLY_A1 3.599 3.500 3.599 3.500
-score FAKE_REPLY_B 2.809 0.475 2.809 0.475
+score END_FUTURE_EMAILS 1.852 1.000 1.852 1.000
+score FAKE_REPLY_A1 3.599 3.499 3.599 3.499
+score FAKE_REPLY_B 2.995 0.001 2.995 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 0.001 0.001 0.001 0.001
-score FONT_INVIS_DIRECT 2.404 0.268 2.404 0.268
+score FONT_INVIS_DIRECT 2.393 0.022 2.393 0.022
score FONT_INVIS_DOTGOV 1.000 1.000 1.000 1.000
score FONT_INVIS_LONG_LINE 1.000 1.000 1.000 1.000
-score FONT_INVIS_MSGID 2.499 1.078 2.499 1.078
-score FONT_INVIS_NORDNS 0.378 2.273 0.378 2.273
+score FONT_INVIS_MSGID 2.499 1.318 2.499 1.318
+score FONT_INVIS_NORDNS 0.350 2.277 0.350 2.277
score FONT_INVIS_POSTEXTRAS 1.000 1.000 1.000 1.000
-score FORGED_RELAY_MUA_TO_MX 3.899 3.597 3.899 3.597
+score FORGED_RELAY_MUA_TO_MX 3.899 3.655 3.899 3.655
score FORM_FRAUD 0.001 0.001 0.001 0.001
-score FORM_FRAUD_3 0.001 2.251 0.001 2.251
-score FORM_FRAUD_5 0.205 0.001 0.205 0.001
+score FORM_FRAUD_3 0.001 2.399 0.001 2.399
+score FORM_FRAUD_5 0.554 0.001 0.554 0.001
score FORM_LOW_CONTRAST 1.000 1.000 1.000 1.000
score FOUND_YOU 3.249 1.000 3.249 1.000
-score FREEMAIL_FORGED_FROMDOMAIN 0.249 0.250 0.249 0.250
+score FREEMAIL_FORGED_FROMDOMAIN 0.250 0.250 0.250 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 1.999 1.999 1.999 1.999
+score FROM_2_EMAILS_SHORT 1.951 1.999 1.951 1.999
score FROM_ADDR_WS 2.999 2.999 2.999 2.999
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.500 0.001 1.500
+score FROM_FMBLA_NEWDOM 0.001 1.499 0.001 1.499
score FROM_FMBLA_NEWDOM14 0.001 0.999 0.001 0.999
score FROM_FMBLA_NEWDOM28 0.001 0.799 0.001 0.799
score FROM_GOV_DKIM_AU 0.001 -0.001 0.001 -0.001
score FROM_GOV_REPLYTO_FREEMAIL 0.001 1.000 0.001 1.000
score FROM_GOV_SPOOF 0.001 0.999 0.001 0.999
score FROM_MISSPACED 1.999 0.001 1.999 0.001
-score FROM_MISSP_DYNIP 0.001 1.536 0.001 1.536
+score FROM_MISSP_DYNIP 0.001 1.527 0.001 1.527
score FROM_MISSP_EH_MATCH 1.999 0.001 1.999 0.001
score FROM_MISSP_FREEMAIL 0.001 0.001 0.001 0.001
score FROM_MISSP_MSFT 0.001 0.001 0.001 0.001
score FROM_MISSP_REPLYTO 0.001 0.001 0.001 0.001
score FROM_MISSP_SPF_FAIL 0.001 0.001 0.001 0.001
score FROM_MISSP_USER 0.001 0.001 0.001 0.001
-score FROM_MISSP_XPRIO 2.499 2.499 2.499 2.499
-score FROM_NAME_EQ_TO_G_DRIVE 1.499 0.612 1.499 0.612
+score FROM_MISSP_XPRIO 2.499 2.495 2.499 2.495
+score FROM_NAME_EQ_TO_G_DRIVE 1.189 1.124 1.189 1.124
score FROM_NEWDOM_BTC 0.001 1.000 0.001 1.000
-score FROM_NTLD_LINKBAIT 0.001 1.999 0.001 1.999
-score FROM_NTLD_REPLY_FREEMAIL 1.324 1.109 1.324 1.109
+score FROM_NTLD_LINKBAIT 1.158 1.113 1.158 1.113
+score FROM_NTLD_REPLY_FREEMAIL 1.933 0.966 1.933 0.966
score FROM_NUMBERO_NEWDOMAIN 0.001 1.000 0.001 1.000
score FROM_NUMERIC_TLD 1.000 1.000 1.000 1.000
score FROM_PAYPAL_SPOOF 0.001 0.001 0.001 0.001
score FROM_SUSPICIOUS_NTLD 0.499 0.499 0.499 0.499
-score FROM_SUSPICIOUS_NTLD_FP 2.000 1.286 2.000 1.286
-score FROM_WSP_TRAIL 0.729 1.676 0.729 1.676
+score FROM_SUSPICIOUS_NTLD_FP 1.999 1.286 1.999 1.286
+score FROM_WSP_TRAIL 0.731 1.068 0.731 1.068
score FSL_BULK_SIG 0.001 0.001 0.001 0.001
score FSL_CTYPE_WIN1251 0.001 0.001 0.001 0.001
score FSL_NEW_HELO_USER 0.001 0.001 0.001 0.001
-score FUZZY_WALLET 2.399 1.514 2.399 1.514
+score FUZZY_WALLET 2.400 1.359 2.400 1.359
score GAPPY_SALES_LEADS_FREEM 1.000 1.000 1.000 1.000
-score GB_BITCOIN_CP 2.491 1.877 2.491 1.877
+score GB_BITCOIN_CP 2.024 1.361 2.024 1.361
score GB_FORGED_MUA_POSTFIX 1.000 1.000 1.000 1.000
score GB_FREEMAIL_DISPTO 0.001 0.001 0.001 0.001
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500 0.500 0.500 0.500
@@ -141,124 +141,124 @@
score GB_WP_FILELINK 1.000 1.000 1.000 1.000
score GOOGLE_DOCS_PHISH 1.000 1.000 1.000 1.000
score GOOGLE_DOCS_PHISH_MANY 1.000 1.000 1.000 1.000
-score GOOGLE_DOC_SUSP 2.499 2.499 2.499 2.499
+score GOOGLE_DOC_SUSP 2.499 2.500 2.499 2.500
score GOOGLE_DRIVE_REPLY_BAD_NTLD 1.000 1.000 1.000 1.000
score GOOG_MALWARE_DNLD 1.000 1.000 1.000 1.000
-score GOOG_REDIR_NORDNS 1.503 2.899 1.503 2.899
-score GOOG_REDIR_SHORT 2.599 2.399 2.599 2.399
+score GOOG_REDIR_NORDNS 2.003 2.899 2.003 2.899
+score GOOG_REDIR_SHORT 2.599 2.499 2.599 2.499
score GOOG_STO_HTML_PHISH 1.000 1.000 1.000 1.000
score GOOG_STO_HTML_PHISH_MANY 1.000 1.000 1.000 1.000
-score GOOG_STO_IMG_HTML 2.695 2.241 2.695 2.241
+score GOOG_STO_IMG_HTML 2.648 1.321 2.648 1.321
score GOOG_STO_IMG_NOHTML 1.000 1.000 1.000 1.000
-score GOOG_STO_NOIMG_HTML 3.000 2.999 3.000 2.999
-score HDRS_LCASE 0.099 0.100 0.099 0.100
+score GOOG_STO_NOIMG_HTML 2.999 2.999 2.999 2.999
+score HDRS_LCASE 0.100 0.100 0.100 0.100
score HDRS_LCASE_IMGONLY 0.099 0.099 0.099 0.099
score HDRS_MISSP 1.000 1.000 1.000 1.000
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.324 1.999 1.324
+score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.710 1.999 1.710
score HDR_ORDER_FTSDMCXX_NORDNS 0.001 0.001 0.001 0.001
score HEADER_FROM_DIFFERENT_DOMAINS 0.249 0.249 0.249 0.249
-score HELO_MISC_IP 0.004 0.001 0.004 0.001
-score HELO_NO_DOMAIN 0.136 0.001 0.136 0.001
+score HELO_MISC_IP 0.003 0.001 0.003 0.001
+score HELO_NO_DOMAIN 0.139 0.001 0.139 0.001
score HEXHASH_WORD 2.999 1.000 2.999 1.000
score HK_CTE_RAW 1.000 1.000 1.000 1.000
-score HK_NAME_MR_MRS 0.792 0.001 0.792 0.001
-score HK_RANDOM_FROM 1.000 0.001 1.000 0.001
+score HK_NAME_MR_MRS 0.793 0.001 0.793 0.001
+score HK_RANDOM_FROM 0.999 0.001 0.999 0.001
score HK_RANDOM_REPLYTO 0.999 0.999 0.999 0.999
score HK_RCVD_IP_MULTICAST 1.999 1.999 1.999 1.999
score HK_SCAM 0.001 0.001 0.001 0.001
-score HOSTED_IMG_DIRECT_MX 3.465 3.434 3.465 3.434
+score HOSTED_IMG_DIRECT_MX 3.475 1.172 3.475 1.172
score HOSTED_IMG_DQ_UNSUB 1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM 3.499 2.891 3.499 2.891
+score HOSTED_IMG_FREEM 3.499 2.892 3.499 2.892
score HOSTED_IMG_MULTI 1.000 1.000 1.000 1.000
score HTML_ENTITY_ASCII 1.000 1.000 1.000 1.000
score HTML_ENTITY_ASCII_TINY 1.000 1.000 1.000 1.000
score HTML_OFF_PAGE 1.000 1.000 1.000 1.000
score HTML_SHRT_CMNT_OBFU_MANY 1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY 0.534 2.499 0.534 2.499
+score HTML_SINGLET_MANY 0.500 2.499 0.500 2.499
score HTML_TEXT_INVISIBLE_FONT 1.999 1.999 1.999 1.999
-score HTML_TEXT_INVISIBLE_STYLE 0.390 1.582 0.390 1.582
-score IMG_ONLY_FM_DOM_INFO 2.499 1.581 2.499 1.581
-score KB_FORGED_MOZ4 2.899 0.569 2.899 0.569
-score KHOP_FAKE_EBAY 0.399 0.326 0.399 0.326
-score KHOP_HELO_FCRDNS 0.400 0.400 0.400 0.400
+score HTML_TEXT_INVISIBLE_STYLE 0.352 1.590 0.352 1.590
+score IMG_ONLY_FM_DOM_INFO 2.500 1.588 2.500 1.588
+score KB_FORGED_MOZ4 2.899 0.616 2.899 0.616
+score KHOP_FAKE_EBAY 0.399 0.561 0.399 0.561
+score KHOP_HELO_FCRDNS 0.399 0.399 0.399 0.399
score LIST_PARTIAL_SHORT_MSG 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.703 1.501 0.703 1.501
-score LONG_HEX_URI 2.199 2.409 2.199 2.409
-score LONG_IMG_URI 1.168 2.934 1.168 2.934
-score LONG_INVISIBLE_TEXT 0.001 0.143 0.001 0.143
+score LIST_PRTL_SAME_USER 0.001 1.074 0.001 1.074
+score LONG_HEX_URI 2.199 1.552 2.199 1.552
+score LONG_IMG_URI 1.655 2.941 1.655 2.941
+score LONG_INVISIBLE_TEXT 0.001 0.147 0.001 0.147
score LOTS_OF_MONEY 0.010 0.010 0.010 0.010
-score LUCRATIVE 2.000 1.999 2.000 1.999
+score LUCRATIVE 1.999 1.999 1.999 1.999
score MALF_HTML_B64 1.000 1.000 1.000 1.000
score MALWARE_NORDNS 1.000 1.000 1.000 1.000
score MALWARE_PASSWORD 1.000 1.000 1.000 1.000
-score MANY_HDRS_LCASE 0.099 0.100 0.099 0.100
-score MANY_SPAN_IN_TEXT 2.299 2.199 2.299 2.199
-score MAY_BE_FORGED 1.791 2.199 1.791 2.199
-score MILLION_HUNDRED 3.000 2.699 3.000 2.699
+score MANY_HDRS_LCASE 0.064 0.100 0.064 0.100
+score MANY_SPAN_IN_TEXT 2.299 2.299 2.299 2.299
+score MAY_BE_FORGED 1.792 2.199 1.792 2.199
+score MILLION_HUNDRED 2.999 2.799 2.999 2.799
score MIMEOLE_DIRECT_TO_MX 0.001 0.001 0.001 0.001
score MIME_NO_TEXT 0.001 0.001 0.001 0.001
-score MIXED_ES 3.200 3.099 3.200 3.099
+score MIXED_ES 3.299 2.999 3.299 2.999
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_FORM 2.414 0.001 2.414 0.001
-score MONEY_FORM_SHORT 0.793 0.001 0.793 0.001
-score MONEY_FRAUD_3 2.599 2.399 2.599 2.399
+score MONEY_FORM 2.419 0.001 2.419 0.001
+score MONEY_FORM_SHORT 0.762 0.007 0.762 0.007
+score MONEY_FRAUD_3 2.599 2.499 2.599 2.499
score MONEY_FRAUD_5 0.001 0.001 0.001 0.001
score MONEY_FRAUD_8 3.099 2.899 3.099 2.899
-score MONEY_FREEMAIL_REPTO 2.999 2.436 2.999 2.436
-score MONEY_FROM_MISSP 0.793 0.001 0.793 0.001
-score MSGID_DOLLARS_URI_IMG 2.999 2.999 2.999 2.999
-score MSGID_NOFQDN1 1.435 1.836 1.435 1.836
-score MSMAIL_PRI_ABNORMAL 0.862 0.001 0.862 0.001
-score MSM_PRIO_REPTO 1.144 1.815 1.144 1.815
-score NAME_EMAIL_DIFF 1.329 0.940 1.329 0.940
+score MONEY_FREEMAIL_REPTO 2.999 2.408 2.999 2.408
+score MONEY_FROM_MISSP 0.790 0.001 0.790 0.001
+score MSGID_DOLLARS_URI_IMG 3.000 2.999 3.000 2.999
+score MSGID_NOFQDN1 1.430 1.846 1.430 1.846
+score MSMAIL_PRI_ABNORMAL 0.227 0.001 0.227 0.001
+score MSM_PRIO_REPTO 1.540 1.867 1.540 1.867
+score NAME_EMAIL_DIFF 1.786 0.779 1.786 0.779
score NA_DOLLARS 1.499 1.499 1.499 1.499
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000 1.000 1.000 1.000
score NICE_REPLY_A -0.001 -0.001 -0.001 -0.001
-score NORDNS_LOW_CONTRAST 1.250 0.001 1.250 0.001
+score NORDNS_LOW_CONTRAST 1.285 0.001 1.285 0.001
score NO_FM_NAME_IP_HOSTN 0.001 0.001 0.001 0.001
score NSL_RCVD_FROM_USER 0.001 0.001 0.001 0.001
-score NSL_RCVD_HELO_USER 0.435 2.399 0.435 2.399
-score NUMBEREND_LINKBAIT 0.034 0.999 0.034 0.999
-score NUMBERONLY_BITCOIN_EXP 0.721 1.749 0.721 1.749
+score NSL_RCVD_HELO_USER 0.810 1.667 0.810 1.667
+score NUMBEREND_LINKBAIT 0.964 0.999 0.964 0.999
+score NUMBERONLY_BITCOIN_EXP 1.122 1.560 1.122 1.560
score OBFU_BITCOIN 1.000 1.000 1.000 1.000
-score OFFER_ONLY_AMERICA 0.493 0.001 0.493 0.001
-score PDS_BTC_ID 0.499 0.391 0.499 0.391
+score OFFER_ONLY_AMERICA 0.494 0.001 0.494 0.001
+score PDS_BTC_ID 0.499 0.326 0.499 0.326
score PDS_BTC_MSGID 0.001 0.001 0.001 0.001
-score PDS_DBL_URL_ILLEGAL_CHARS 0.542 0.888 0.542 0.888
+score PDS_DBL_URL_ILLEGAL_CHARS 0.001 1.620 0.001 1.620
score PDS_DBL_URL_TNB_RUNON 1.999 1.999 1.999 1.999
-score PDS_EMPTYSUBJ_URISHRT 1.499 1.499 1.499 1.499
+score PDS_EMPTYSUBJ_URISHRT 1.499 1.498 1.499 1.498
score PDS_FRNOM_TODOM_NAKED_TO 1.499 1.499 1.499 1.499
-score PDS_FROM_2_EMAILS 1.594 0.562 1.594 0.562
-score PDS_FROM_NAME_TO_DOMAIN 0.999 0.999 0.999 0.999
+score PDS_FROM_2_EMAILS 1.550 0.722 1.550 0.722
+score PDS_FROM_NAME_TO_DOMAIN 0.999 1.000 0.999 1.000
score PDS_HELO_SPF_FAIL 0.001 1.000 0.001 1.000
-score PDS_NAKED_TO_NUMERO 2.000 1.999 2.000 1.999
+score PDS_NAKED_TO_NUMERO 1.999 1.997 1.999 1.997
score PDS_NO_FULL_NAME_SPOOFED_URL 0.749 0.749 0.749 0.749
-score PDS_OTHER_BAD_TLD 2.000 1.944 2.000 1.944
+score PDS_OTHER_BAD_TLD 1.999 1.879 1.999 1.879
score PDS_RDNS_DYNAMIC_FP 0.001 0.001 0.001 0.001
score PDS_SHORT_SPOOFED_URL 1.999 1.999 1.999 1.999
-score PDS_TINYSUBJ_URISHRT 1.499 0.282 1.499 0.282
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 2.000 2.000 2.000 2.000
+score PDS_TINYSUBJ_URISHRT 1.499 0.276 1.499 0.276
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999 1.997 1.999 1.997
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999 1.999 1.999 1.999
score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999 1.999 1.999 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000 0.999 1.000 0.999
-score PDS_TO_EQ_FROM_NAME 0.074 0.940 0.074 0.940
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999 1.000 0.999 1.000
+score PDS_TO_EQ_FROM_NAME 0.001 0.782 0.001 0.782
score PHOTO_EDITING_DIRECT 1.000 1.000 1.000 1.000
score PHP_NOVER_MUA 1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT 0.389 1.000 0.389 1.000
+score PHP_ORIG_SCRIPT 0.351 0.001 0.351 0.001
score PHP_SCRIPT 2.499 2.499 2.499 2.499
score PHP_SCRIPT_MUA 1.000 1.000 1.000 1.000
-score PP_MIME_FAKE_ASCII_TEXT 0.999 0.116 0.999 0.116
+score PP_MIME_FAKE_ASCII_TEXT 1.000 0.111 1.000 0.111
score PP_TOO_MUCH_UNICODE02 0.500 0.500 0.500 0.500
score PP_TOO_MUCH_UNICODE05 1.000 1.000 1.000 1.000
score PUMPDUMP 1.000 1.000 1.000 1.000
score PUMPDUMP_MULTI 1.000 1.000 1.000 1.000
score RAND_HEADER_MANY 1.000 1.000 1.000 1.000
-score RATWARE_NO_RDNS 1.207 2.471 1.207 2.471
+score RATWARE_NO_RDNS 1.680 2.232 1.680 2.232
score RCVD_DOTEDU_SHORT 1.000 2.499 1.000 2.499
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
@@ -273,79 +273,79 @@
score RCVD_IN_MSPIKE_WL 0.001 0.001 0.001 0.001
score RCVD_IN_MSPIKE_ZBI 0.001 0.001 0.001 0.001
score RDNS_NUM_TLD_ATCHNX 1.000 1.000 1.000 1.000
-score RDNS_NUM_TLD_XM 2.999 1.958 2.999 1.958
+score RDNS_NUM_TLD_XM 3.000 2.512 3.000 2.512
score RISK_FREE 3.599 3.399 3.599 3.399
score SENDGRID_REDIR 1.499 1.499 1.499 1.499
-score SENDGRID_REDIR_PHISH 2.574 2.766 2.574 2.766
+score SENDGRID_REDIR_PHISH 3.090 2.285 3.090 2.285
score SEO_SUSP_NTLD 1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_VIAGRA01 0.034 0.001 0.034 0.001
+score SERGIO_SUBJECT_VIAGRA01 0.025 0.001 0.025 0.001
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499 0.001 2.499 0.001
-score SHORTENER_SHORT_IMG 0.698 2.500 0.698 2.500
-score SHORT_BODY_G_DRIVE_DYN 0.001 0.688 0.001 0.688
-score SHORT_IMG_SUSP_NTLD 1.499 1.000 1.499 1.000
+score SHORTENER_SHORT_IMG 0.705 2.500 0.705 2.500
+score SHORT_BODY_G_DRIVE_DYN 0.952 1.499 0.952 1.499
+score SHORT_IMG_SUSP_NTLD 0.648 1.000 0.648 1.000
score SHORT_SHORTNER 1.999 1.999 1.999 1.999
-score SINGLETS_LOW_CONTRAST 0.001 0.440 0.001 0.440
-score SPOOFED_FREEMAIL 0.001 1.503 0.001 1.503
+score SINGLETS_LOW_CONTRAST 0.001 0.902 0.001 0.902
+score SPOOFED_FREEMAIL 0.001 1.501 0.001 1.501
score SPOOFED_FREEMAIL_NO_RDNS 1.500 0.001 1.500 0.001
-score SPOOFED_FREEM_REPTO 0.001 2.494 0.001 2.494
-score SPOOFED_FREEM_REPTO_CHN 0.001 2.714 0.001 2.714
+score SPOOFED_FREEM_REPTO 0.001 2.499 0.001 2.499
+score SPOOFED_FREEM_REPTO_CHN 0.001 1.857 0.001 1.857
score SPOOFED_FREEM_REPTO_RUS 0.001 1.000 0.001 1.000
-score STATIC_XPRIO_OLE 2.000 1.999 2.000 1.999
-score STOCK_LOW_CONTRAST 0.636 1.000 0.636 1.000
+score STATIC_XPRIO_OLE 1.999 1.999 1.999 1.999
+score STOCK_LOW_CONTRAST 0.602 1.000 0.602 1.000
score STOCK_TIP 1.000 1.000 1.000 1.000
-score SUBJ_OBFU_PUNCT_FEW 0.488 0.749 0.488 0.749
-score SUBJ_OBFU_PUNCT_MANY 0.862 1.749 0.862 1.749
-score SUBJ_UNNEEDED_HTML 1.803 2.399 1.803 2.399
+score SUBJ_OBFU_PUNCT_FEW 0.469 0.749 0.469 0.749
+score SUBJ_OBFU_PUNCT_MANY 0.882 1.716 0.882 1.716
+score SUBJ_UNNEEDED_HTML 2.139 2.399 2.139 2.399
score SURBL_BLOCKED 0.001 0.001 0.001 0.001
score SYSADMIN 1.000 1.000 1.000 1.000
-score THIS_AD 1.099 0.999 1.099 0.999
+score THIS_AD 1.099 1.099 1.099 1.099
score THIS_IS_ADV_SUSP_NTLD 0.001 1.000 0.001 1.000
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499 1.499 1.499 1.499
-score TO_EQ_FM_DIRECT_MX 0.001 1.530 0.001 1.530
-score TO_EQ_FM_DOM_HTML_IMG 0.175 0.684 0.175 0.684
-score TO_EQ_FM_DOM_HTML_ONLY 0.707 1.155 0.707 1.155
+score TO_EQ_FM_DIRECT_MX 0.001 1.567 0.001 1.567
+score TO_EQ_FM_DOM_HTML_IMG 0.201 0.250 0.201 0.250
+score TO_EQ_FM_DOM_HTML_ONLY 1.152 1.398 1.152 1.398
score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_ONLY 0.203 0.281 0.203 0.281
+score TO_EQ_FM_HTML_ONLY 0.433 0.899 0.433 0.899
score TO_EQ_FM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_IN_SUBJ 0.100 0.100 0.100 0.100
-score TO_NAME_SUBJ_NO_RDNS 2.493 1.767 2.493 1.767
-score TO_NO_BRKTS_FROM_MSSP 2.499 2.499 2.499 2.499
+score TO_IN_SUBJ 0.100 0.099 0.100 0.099
+score TO_NAME_SUBJ_NO_RDNS 2.499 1.611 2.499 1.611
+score TO_NO_BRKTS_FROM_MSSP 2.499 2.500 2.499 2.500
score TO_NO_BRKTS_HTML_IMG 1.999 0.001 1.999 0.001
score TO_NO_BRKTS_HTML_ONLY 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_MSFT 2.499 1.945 2.499 1.945
-score TO_NO_BRKTS_NORDNS_HTML 1.999 1.680 1.999 1.680
-score TO_NO_BRKTS_PCNT 1.961 2.499 1.961 2.499
-score TVD_IP_HEX 1.831 0.475 1.831 0.475
-score TVD_IP_SING_HEX 2.216 2.288 2.216 2.288
-score TVD_RCVD_SPACE_BRACKET 3.399 1.470 3.399 1.470
-score TVD_SPACE_ENCODED 2.499 2.060 2.499 2.060
+score TO_NO_BRKTS_MSFT 2.499 1.892 2.499 1.892
+score TO_NO_BRKTS_NORDNS_HTML 1.999 1.732 1.999 1.732
+score TO_NO_BRKTS_PCNT 1.562 2.500 1.562 2.500
+score TVD_IP_HEX 1.326 0.721 1.326 0.721
+score TVD_IP_SING_HEX 2.485 1.268 2.485 1.268
+score TVD_RCVD_SPACE_BRACKET 3.399 1.366 3.399 1.366
+score TVD_SPACE_ENCODED 2.499 2.306 2.499 2.306
score TVD_SPACE_RATIO_MINFP 2.499 2.499 2.499 2.499
-score TVD_SUBJ_NUM_OBFU_MINFP 2.604 1.551 2.604 1.551
+score TVD_SUBJ_NUM_OBFU_MINFP 1.742 1.232 1.742 1.232
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 UNICODE_OBFU_ASC 1.000 1.000 1.000 1.000
score UNICODE_OBFU_ZW 1.000 1.000 1.000 1.000
-score UPGRADE_MAILBOX 0.519 1.140 0.519 1.140
+score UPGRADE_MAILBOX 0.025 1.134 0.025 1.134
score URI_DASHGOVEDU 1.000 1.000 1.000 1.000
score URI_DATA 1.000 1.000 1.000 1.000
score URI_DOTEDU 1.999 1.999 1.999 1.999
score URI_DOTEDU_ENTITY 1.000 1.000 1.000 1.000
-score URI_GOOGLE_PROXY 2.087 0.630 2.087 0.630
+score URI_GOOGLE_PROXY 2.083 0.631 2.083 0.631
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_ONLY_MSGID_MALF 1.701 0.001 1.701 0.001
+score URI_ONLY_MSGID_MALF 1.674 0.001 1.674 0.001
score URI_OPTOUT_3LD 1.000 1.000 1.000 1.000
-score URI_PHISH 3.052 3.400 3.052 3.400
-score URI_PHP_REDIR 3.499 3.500 3.499 3.500
-score URI_TRY_3LD 1.011 1.539 1.011 1.539
-score URI_WPADMIN 0.787 0.939 0.787 0.939
+score URI_PHISH 3.049 3.400 3.049 3.400
+score URI_PHP_REDIR 3.499 3.499 3.499 3.499
+score URI_TRY_3LD 1.505 1.540 1.505 1.540
+score URI_WPADMIN 0.787 0.834 0.787 0.834
score URI_WP_DIRINDEX 3.499 3.499 3.499 3.499
score URI_WP_HACKED 3.499 3.499 3.499 3.499
-score URI_WP_HACKED_2 2.499 2.499 2.499 2.499
+score URI_WP_HACKED_2 2.499 2.500 2.499 2.500
score USB_DRIVES 1.000 1.000 1.000 1.000
score VPS_NO_NTLD 1.000 1.000 1.000 1.000
score WALMART_IMG_NOT_RCVD_WAL 1.000 1.000 1.000 1.000
score XPRIO 2.249 1.000 2.249 1.000
-score XPRIO_SHORT_SUBJ 1.560 2.499 1.560 2.499
-score XPRIO_URL_SHORTNER 0.503 0.999 0.503 0.999
+score XPRIO_SHORT_SUBJ 2.349 2.499 2.349 2.499
+score XPRIO_URL_SHORTNER 0.502 1.000 0.502 1.000
score YOU_INHERIT 0.001 0.001 0.001 0.001
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index b238527..d11339d 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -5,209 +5,209 @@
score AC_DIV_BONANZA 0.001
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
-score ADVANCE_FEE_2_NEW_MONEY 1.173
-score ADVANCE_FEE_3_NEW 2.598
-score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW 2.499
+score ADVANCE_FEE_2_NEW_MONEY 1.172
+score ADVANCE_FEE_3_NEW 2.601
+score ADVANCE_FEE_3_NEW_MONEY 0.292
+score ADVANCE_FEE_4_NEW 2.599
score ADVANCE_FEE_5_NEW 3.199
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 2.290
score ALIBABA_IMG_NOT_RCVD_ALI 2.499
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score APP_DEVELOPMENT_NORDNS 1.618
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.580
+score APP_DEVELOPMENT_NORDNS 1.625
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 # force non-zero
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.366
score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 2.101
+score BITCOIN_EXTORT_01 2.111
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_SPAM_02 2.401
+score BITCOIN_SPAM_02 2.406
score BITCOIN_SPAM_03 2.499
-score BITCOIN_SPAM_07 3.482
+score BITCOIN_SPAM_07 3.320
score BITCOIN_XPRIO 0.001
-score BITCOIN_YOUR_INFO 1.102
+score BITCOIN_YOUR_INFO 0.001
score BODY_EMPTY 1.999
score BODY_SINGLE_URI 2.499
-score BODY_SINGLE_WORD 0.303
-score BODY_URI_ONLY 1.499
+score BODY_SINGLE_WORD 0.301
+score BODY_URI_ONLY 1.500
score BOGUS_MIME_VERSION 3.499
-score BOGUS_MSM_HDRS 0.821
+score BOGUS_MSM_HDRS 0.520
score CK_HELO_GENERIC 0.249
score CTE_8BIT_MISMATCH 0.999
score DATE_IN_FUTURE_96_Q 2.799
score DEAR_BENEFICIARY 0.001
score DSN_NO_MIMEVERSION 1.999
-score END_FUTURE_EMAILS 1.935
+score END_FUTURE_EMAILS 1.852
score FAKE_REPLY_A1 3.599
-score FAKE_REPLY_B 2.809
+score FAKE_REPLY_B 2.995
score FILL_THIS_FORM 0.001
-score FONT_INVIS_DIRECT 2.404
+score FONT_INVIS_DIRECT 2.393
score FONT_INVIS_MSGID 2.499
-score FONT_INVIS_NORDNS 0.378
+score FONT_INVIS_NORDNS 0.350
score FORGED_RELAY_MUA_TO_MX 3.899
score FORM_FRAUD 0.001
score FORM_FRAUD_3 0.001
-score FORM_FRAUD_5 0.205
+score FORM_FRAUD_5 0.554
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROM_2_EMAILS_SHORT 1.999
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FROM_2_EMAILS_SHORT 1.951
score FROM_ADDR_WS 2.999
score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 0.001
+score FROM_MISSP_DYNIP 0.001 # force non-zero
score FROM_MISSP_EH_MATCH 1.999
score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 0.001
+score FROM_MISSP_REPLYTO 0.001 # force non-zero
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 2.499
-score FROM_NAME_EQ_TO_G_DRIVE 1.499
-score FROM_NTLD_LINKBAIT 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.324
+score FROM_NAME_EQ_TO_G_DRIVE 1.189
+score FROM_NTLD_LINKBAIT 1.158
+score FROM_NTLD_REPLY_FREEMAIL 1.933
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 2.000
-score FROM_WSP_TRAIL 0.729
+score FROM_SUSPICIOUS_NTLD_FP 1.999
+score FROM_WSP_TRAIL 0.731
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_WALLET 2.399
-score GB_BITCOIN_CP 2.491
+score FUZZY_WALLET 2.400
+score GB_BITCOIN_CP 2.024
score GB_FREEMAIL_DISPTO 0.001
score GB_GOOGLE_OBFUS 0.749
score GOOGLE_DOC_SUSP 2.499
-score GOOG_REDIR_NORDNS 1.503
+score GOOG_REDIR_NORDNS 2.003
score GOOG_REDIR_SHORT 2.599
-score GOOG_STO_IMG_HTML 2.695
-score GOOG_STO_NOIMG_HTML 3.000
-score HDRS_LCASE 0.099
+score GOOG_STO_IMG_HTML 2.648
+score GOOG_STO_NOIMG_HTML 2.999
+score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
-score HELO_MISC_IP 0.004
-score HELO_NO_DOMAIN 0.136
+score HELO_MISC_IP 0.003
+score HELO_NO_DOMAIN 0.139
score HEXHASH_WORD 2.999
-score HK_NAME_MR_MRS 0.792
-score HK_RANDOM_FROM 1.000
+score HK_NAME_MR_MRS 0.793
+score HK_RANDOM_FROM 0.999
score HK_RANDOM_REPLYTO 0.999
score HK_RCVD_IP_MULTICAST 1.999
score HK_SCAM 0.001
-score HOSTED_IMG_DIRECT_MX 3.465
+score HOSTED_IMG_DIRECT_MX 3.475
score HOSTED_IMG_FREEM 3.499
-score HTML_SINGLET_MANY 0.534
+score HTML_SINGLET_MANY 0.500
score HTML_TEXT_INVISIBLE_FONT 1.999
-score HTML_TEXT_INVISIBLE_STYLE 0.390
-score IMG_ONLY_FM_DOM_INFO 2.499
+score HTML_TEXT_INVISIBLE_STYLE 0.352
+score IMG_ONLY_FM_DOM_INFO 2.500
score KB_FORGED_MOZ4 2.899
score KHOP_FAKE_EBAY 0.399
-score KHOP_HELO_FCRDNS 0.400
-score LIST_PRTL_SAME_USER 0.703
+score KHOP_HELO_FCRDNS 0.399
+score LIST_PRTL_SAME_USER 0.001
score LONG_HEX_URI 2.199
-score LONG_IMG_URI 1.168
+score LONG_IMG_URI 1.655
score LONG_INVISIBLE_TEXT 0.001
score LOTS_OF_MONEY 0.010
-score LUCRATIVE 2.000
-score MANY_HDRS_LCASE 0.099
+score LUCRATIVE 1.999
+score MANY_HDRS_LCASE 0.064
score MANY_SPAN_IN_TEXT 2.299
-score MAY_BE_FORGED 1.791
-score MILLION_HUNDRED 3.000
+score MAY_BE_FORGED 1.792
+score MILLION_HUNDRED 2.999
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 0.001
-score MIXED_ES 3.200
+score MIXED_ES 3.299
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 2.414
-score MONEY_FORM_SHORT 0.793
+score MONEY_FORM 2.419
+score MONEY_FORM_SHORT 0.762
score MONEY_FRAUD_3 2.599
score MONEY_FRAUD_5 0.001
score MONEY_FRAUD_8 3.099
score MONEY_FREEMAIL_REPTO 2.999
-score MONEY_FROM_MISSP 0.793
-score MSGID_DOLLARS_URI_IMG 2.999
-score MSGID_NOFQDN1 1.435
-score MSMAIL_PRI_ABNORMAL 0.862
-score MSM_PRIO_REPTO 1.144
-score NAME_EMAIL_DIFF 1.329
+score MONEY_FROM_MISSP 0.790
+score MSGID_DOLLARS_URI_IMG 3.000
+score MSGID_NOFQDN1 1.430
+score MSMAIL_PRI_ABNORMAL 0.227
+score MSM_PRIO_REPTO 1.540
+score NAME_EMAIL_DIFF 1.786
score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 1.250
+score NORDNS_LOW_CONTRAST 1.285
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 0.435
-score NUMBEREND_LINKBAIT 0.034
-score NUMBERONLY_BITCOIN_EXP 0.721
-score OFFER_ONLY_AMERICA 0.493
+score NSL_RCVD_HELO_USER 0.810
+score NUMBEREND_LINKBAIT 0.964
+score NUMBERONLY_BITCOIN_EXP 1.122
+score OFFER_ONLY_AMERICA 0.494
score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.001
-score PDS_DBL_URL_ILLEGAL_CHARS 0.542
+score PDS_DBL_URL_ILLEGAL_CHARS 0.001
score PDS_DBL_URL_TNB_RUNON 1.999
score PDS_EMPTYSUBJ_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 1.594
+score PDS_FROM_2_EMAILS 1.550
score PDS_FROM_NAME_TO_DOMAIN 0.999
-score PDS_NAKED_TO_NUMERO 2.000
+score PDS_NAKED_TO_NUMERO 1.999
score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
-score PDS_OTHER_BAD_TLD 2.000
+score PDS_OTHER_BAD_TLD 1.999
score PDS_RDNS_DYNAMIC_FP 0.001 # force non-zero
score PDS_SHORT_SPOOFED_URL 1.999
score PDS_TINYSUBJ_URISHRT 1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 2.000
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000
-score PDS_TO_EQ_FROM_NAME 0.074
-score PHP_ORIG_SCRIPT 0.389
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
+score PDS_TO_EQ_FROM_NAME 0.001
+score PHP_ORIG_SCRIPT 0.351
score PHP_SCRIPT 2.499
-score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RATWARE_NO_RDNS 1.207
-score RDNS_NUM_TLD_XM 2.999
+score PP_MIME_FAKE_ASCII_TEXT 1.000
+score RATWARE_NO_RDNS 1.680
+score RDNS_NUM_TLD_XM 3.000
score RISK_FREE 3.599
score SENDGRID_REDIR 1.499
-score SENDGRID_REDIR_PHISH 2.574
-score SERGIO_SUBJECT_VIAGRA01 0.034
+score SENDGRID_REDIR_PHISH 3.090
+score SERGIO_SUBJECT_VIAGRA01 0.025
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
-score SHORTENER_SHORT_IMG 0.698
-score SHORT_BODY_G_DRIVE_DYN 0.001
-score SHORT_IMG_SUSP_NTLD 1.499
+score SHORTENER_SHORT_IMG 0.705
+score SHORT_BODY_G_DRIVE_DYN 0.952
+score SHORT_IMG_SUSP_NTLD 0.648
score SHORT_SHORTNER 1.999
-score SINGLETS_LOW_CONTRAST 0.001
+score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 1.500
-score STATIC_XPRIO_OLE 2.000
-score STOCK_LOW_CONTRAST 0.636
-score SUBJ_OBFU_PUNCT_FEW 0.488
-score SUBJ_OBFU_PUNCT_MANY 0.862
-score SUBJ_UNNEEDED_HTML 1.803
+score STATIC_XPRIO_OLE 1.999
+score STOCK_LOW_CONTRAST 0.602
+score SUBJ_OBFU_PUNCT_FEW 0.469
+score SUBJ_OBFU_PUNCT_MANY 0.882
+score SUBJ_UNNEEDED_HTML 2.139
score THIS_AD 1.099
score THIS_IS_ADV_SUSP_NTLD 0.001 # force non-zero
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
score TO_EQ_FM_DIRECT_MX 0.001
-score TO_EQ_FM_DOM_HTML_IMG 0.175
-score TO_EQ_FM_DOM_HTML_ONLY 0.707
-score TO_EQ_FM_HTML_ONLY 0.203
+score TO_EQ_FM_DOM_HTML_IMG 0.201
+score TO_EQ_FM_DOM_HTML_ONLY 1.152
+score TO_EQ_FM_HTML_ONLY 0.433
score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 2.493
+score TO_NAME_SUBJ_NO_RDNS 2.499
score TO_NO_BRKTS_FROM_MSSP 2.499
score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 2.499
score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TO_NO_BRKTS_PCNT 1.961
-score TVD_IP_HEX 1.831
-score TVD_IP_SING_HEX 2.216
+score TO_NO_BRKTS_PCNT 1.562
+score TVD_IP_HEX 1.326
+score TVD_IP_SING_HEX 2.485
score TVD_RCVD_SPACE_BRACKET 3.399
score TVD_SPACE_ENCODED 2.499
score TVD_SPACE_RATIO_MINFP 2.499
-score TVD_SUBJ_NUM_OBFU_MINFP 2.604
-score UPGRADE_MAILBOX 0.519
+score TVD_SUBJ_NUM_OBFU_MINFP 1.742
+score UPGRADE_MAILBOX 0.025
score URI_DOTEDU 1.999
-score URI_GOOGLE_PROXY 2.087
-score URI_ONLY_MSGID_MALF 1.701
-score URI_PHISH 3.052
+score URI_GOOGLE_PROXY 2.083
+score URI_ONLY_MSGID_MALF 1.674
+score URI_PHISH 3.049
score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.011
+score URI_TRY_3LD 1.505
score URI_WPADMIN 0.787
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
score URI_WP_HACKED_2 2.499
score XPRIO 2.249
-score XPRIO_SHORT_SUBJ 1.560
-score XPRIO_URL_SHORTNER 0.503
+score XPRIO_SHORT_SUBJ 2.349
+score XPRIO_URL_SHORTNER 0.502
score YOU_INHERIT 0.001
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index bff293c..9ddeb93 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -3,222 +3,223 @@
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
-score AC_FROM_MANY_DOTS 0.640
-score AC_HTML_NONSENSE_TAGS 2.000
+score AC_FROM_MANY_DOTS 0.649
+score AC_HTML_NONSENSE_TAGS 1.999
score ADVANCE_FEE_2_NEW_MONEY 0.001
-score ADVANCE_FEE_3_NEW 3.467
-score ADVANCE_FEE_3_NEW_MONEY 0.001
+score ADVANCE_FEE_3_NEW 3.468
+score ADVANCE_FEE_3_NEW_MONEY 0.019
score ADVANCE_FEE_4_NEW 0.001
-score ADVANCE_FEE_5_NEW 2.999
+score ADVANCE_FEE_5_NEW 2.897
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
-score ALIBABA_IMG_NOT_RCVD_ALI 2.500
+score ALIBABA_IMG_NOT_RCVD_ALI 2.499
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.283
-score BITCOIN_DEADLINE 0.898
-score BITCOIN_EXTORT_01 3.334
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.481
+score BITCOIN_DEADLINE 0.852
+score BITCOIN_EXTORT_01 3.399
score BITCOIN_MALF_HTML 3.499
score BITCOIN_SPAM_02 2.499
score BITCOIN_SPAM_03 2.499
score BITCOIN_SPAM_05 2.499
-score BITCOIN_SPAM_07 1.842
+score BITCOIN_SPAM_07 2.857
score BITCOIN_XPRIO 0.001
score BITCOIN_YOUR_INFO 0.001
score BODY_EMPTY 1.999
-score BODY_SINGLE_URI 2.500
+score BODY_SINGLE_URI 2.499
score BODY_SINGLE_WORD 0.001
score BODY_URI_ONLY 1.499
score BOGUS_MIME_VERSION 3.499
-score BOGUS_MSM_HDRS 2.172
+score BOGUS_MSM_HDRS 1.525
score CK_HELO_GENERIC 0.001
score CTE_8BIT_MISMATCH 0.999
score DATE_IN_FUTURE_96_Q 2.799
-score DEAR_BENEFICIARY 0.001 # force non-zero
+score DEAR_BENEFICIARY 0.001
score DKIMWL_BL 2.999
-score DKIMWL_WL_HIGH -0.001 # force non-zero
+score DKIMWL_WL_HIGH -0.001
score DKIMWL_WL_MED -0.001
score DKIMWL_WL_MEDHI -0.001
score DSN_NO_MIMEVERSION 1.999
-score FAKE_REPLY_A1 3.500
-score FAKE_REPLY_B 0.475
+score FAKE_REPLY_A1 3.499
+score FAKE_REPLY_B 0.001
score FILL_THIS_FORM 0.001
-score FONT_INVIS_DIRECT 0.268
-score FONT_INVIS_MSGID 1.078
-score FONT_INVIS_NORDNS 2.273
-score FORGED_RELAY_MUA_TO_MX 3.597
+score FONT_INVIS_DIRECT 0.022
+score FONT_INVIS_MSGID 1.318
+score FONT_INVIS_NORDNS 2.277
+score FORGED_RELAY_MUA_TO_MX 3.655
score FORGED_SPF_HELO 1.199
score FORM_FRAUD 0.001
-score FORM_FRAUD_3 2.251
-score FORM_FRAUD_5 0.001 # force non-zero
+score FORM_FRAUD_3 2.399
+score FORM_FRAUD_5 0.001
score FREEMAIL_FORGED_FROMDOMAIN 0.250
score FROM_2_EMAILS_SHORT 1.999
score FROM_ADDR_WS 2.999
-score FROM_FMBLA_NEWDOM 1.500
+score FROM_FMBLA_NEWDOM 1.499
score FROM_FMBLA_NEWDOM14 0.999
score FROM_FMBLA_NEWDOM28 0.799
score FROM_GOV_DKIM_AU -0.001
score FROM_GOV_SPOOF 0.999
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.536
+score FROM_MISSP_DYNIP 1.527
score FROM_MISSP_EH_MATCH 0.001
score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_REPLYTO 0.001
-score FROM_MISSP_SPF_FAIL 0.001
-score FROM_MISSP_USER 0.001
-score FROM_MISSP_XPRIO 2.499
-score FROM_NAME_EQ_TO_G_DRIVE 0.612
-score FROM_NTLD_LINKBAIT 1.999
-score FROM_NTLD_REPLY_FREEMAIL 1.109
+score FROM_MISSP_SPF_FAIL 0.001 # force non-zero
+score FROM_MISSP_USER 0.001 # force non-zero
+score FROM_MISSP_XPRIO 2.495
+score FROM_NAME_EQ_TO_G_DRIVE 1.124
+score FROM_NTLD_LINKBAIT 1.113
+score FROM_NTLD_REPLY_FREEMAIL 0.966
score FROM_PAYPAL_SPOOF 0.001
score FROM_SUSPICIOUS_NTLD 0.499
score FROM_SUSPICIOUS_NTLD_FP 1.286
-score FROM_WSP_TRAIL 1.676
-score FSL_BULK_SIG 0.001
+score FROM_WSP_TRAIL 1.068
+score FSL_BULK_SIG 0.001 # force non-zero
score FSL_CTYPE_WIN1251 0.001
-score FSL_NEW_HELO_USER 0.001
-score FUZZY_WALLET 1.514
-score GB_BITCOIN_CP 1.877
-score GB_FREEMAIL_DISPTO 0.001
+score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FUZZY_WALLET 1.359
+score GB_BITCOIN_CP 1.361
+score GB_FREEMAIL_DISPTO 0.001 # force non-zero
score GB_GOOGLE_OBFUS 0.749
-score GOOGLE_DOC_SUSP 2.499
+score GOOGLE_DOC_SUSP 2.500
score GOOG_REDIR_NORDNS 2.899
-score GOOG_REDIR_SHORT 2.399
-score GOOG_STO_IMG_HTML 2.241
+score GOOG_REDIR_SHORT 2.499
+score GOOG_STO_IMG_HTML 1.321
score GOOG_STO_NOIMG_HTML 2.999
score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
-score HDR_ORDER_FTSDMCXX_DIRECT 1.324
+score HDR_ORDER_FTSDMCXX_DIRECT 1.710
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
-score HELO_MISC_IP 0.001
+score HELO_MISC_IP 0.001 # force non-zero
score HELO_NO_DOMAIN 0.001
score HK_NAME_MR_MRS 0.001
score HK_RANDOM_FROM 0.001
score HK_RANDOM_REPLYTO 0.999
score HK_RCVD_IP_MULTICAST 1.999
score HK_SCAM 0.001
-score HOSTED_IMG_DIRECT_MX 3.434
-score HOSTED_IMG_FREEM 2.891
+score HOSTED_IMG_DIRECT_MX 1.172
+score HOSTED_IMG_FREEM 2.892
score HTML_SINGLET_MANY 2.499
score HTML_TEXT_INVISIBLE_FONT 1.999
-score HTML_TEXT_INVISIBLE_STYLE 1.582
-score IMG_ONLY_FM_DOM_INFO 1.581
-score KB_FORGED_MOZ4 0.569
-score KHOP_FAKE_EBAY 0.326
-score KHOP_HELO_FCRDNS 0.400
-score LIST_PRTL_SAME_USER 1.501
-score LONG_HEX_URI 2.409
-score LONG_IMG_URI 2.934
-score LONG_INVISIBLE_TEXT 0.143
+score HTML_TEXT_INVISIBLE_STYLE 1.590
+score IMG_ONLY_FM_DOM_INFO 1.588
+score KB_FORGED_MOZ4 0.616
+score KHOP_FAKE_EBAY 0.561
+score KHOP_HELO_FCRDNS 0.399
+score LIST_PRTL_SAME_USER 1.074
+score LONG_HEX_URI 1.552
+score LONG_IMG_URI 2.941
+score LONG_INVISIBLE_TEXT 0.147
score LOTS_OF_MONEY 0.010
score LUCRATIVE 1.999
score MANY_HDRS_LCASE 0.100
-score MANY_SPAN_IN_TEXT 2.199
+score MANY_SPAN_IN_TEXT 2.299
score MAY_BE_FORGED 2.199
-score MILLION_HUNDRED 2.699
+score MILLION_HUNDRED 2.799
score MIMEOLE_DIRECT_TO_MX 0.001
-score MIME_NO_TEXT 0.001
-score MIXED_ES 3.099
-score MONEY_ATM_CARD 0.001 # force non-zero
-score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 2.399
+score MIME_NO_TEXT 0.001 # force non-zero
+score MIXED_ES 2.999
+score MONEY_ATM_CARD 0.001
+score MONEY_FORM 0.001 # force non-zero
+score MONEY_FORM_SHORT 0.007
+score MONEY_FRAUD_3 2.499
score MONEY_FRAUD_5 0.001
score MONEY_FRAUD_8 2.899
-score MONEY_FREEMAIL_REPTO 2.436
+score MONEY_FREEMAIL_REPTO 2.408
score MONEY_FROM_MISSP 0.001
score MSGID_DOLLARS_URI_IMG 2.999
-score MSGID_NOFQDN1 1.836
+score MSGID_NOFQDN1 1.846
score MSMAIL_PRI_ABNORMAL 0.001
-score MSM_PRIO_REPTO 1.815
-score NAME_EMAIL_DIFF 0.940
+score MSM_PRIO_REPTO 1.867
+score NAME_EMAIL_DIFF 0.779
score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
score NORDNS_LOW_CONTRAST 0.001
score NO_FM_NAME_IP_HOSTN 0.001
-score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 2.399
+score NSL_RCVD_FROM_USER 0.001 # force non-zero
+score NSL_RCVD_HELO_USER 1.667
score NUMBEREND_LINKBAIT 0.999
-score NUMBERONLY_BITCOIN_EXP 1.749
+score NUMBERONLY_BITCOIN_EXP 1.560
score OFFER_ONLY_AMERICA 0.001 # force non-zero
-score PDS_BTC_ID 0.391
+score PDS_BTC_ID 0.326
score PDS_BTC_MSGID 0.001
-score PDS_DBL_URL_ILLEGAL_CHARS 0.888
+score PDS_DBL_URL_ILLEGAL_CHARS 1.620
score PDS_DBL_URL_TNB_RUNON 1.999
-score PDS_EMPTYSUBJ_URISHRT 1.499
+score PDS_EMPTYSUBJ_URISHRT 1.498
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 0.562
-score PDS_FROM_NAME_TO_DOMAIN 0.999
-score PDS_NAKED_TO_NUMERO 1.999
+score PDS_FROM_2_EMAILS 0.722
+score PDS_FROM_NAME_TO_DOMAIN 1.000
+score PDS_NAKED_TO_NUMERO 1.997
score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
-score PDS_OTHER_BAD_TLD 1.944
+score PDS_OTHER_BAD_TLD 1.879
score PDS_RDNS_DYNAMIC_FP 0.001 # force non-zero
score PDS_SHORT_SPOOFED_URL 1.999
-score PDS_TINYSUBJ_URISHRT 0.282
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 2.000
+score PDS_TINYSUBJ_URISHRT 0.276
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PDS_TO_EQ_FROM_NAME 0.940
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000
+score PDS_TO_EQ_FROM_NAME 0.782
+score PHP_ORIG_SCRIPT 0.001 # force non-zero
score PHP_SCRIPT 2.499
-score PP_MIME_FAKE_ASCII_TEXT 0.116
-score RATWARE_NO_RDNS 2.471
+score PP_MIME_FAKE_ASCII_TEXT 0.111
+score RATWARE_NO_RDNS 2.232
score RCVD_DOTEDU_SHORT 2.499
score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_XM 1.958
+score RDNS_NUM_TLD_XM 2.512
score RISK_FREE 3.399
score SENDGRID_REDIR 1.499
-score SENDGRID_REDIR_PHISH 2.766
+score SENDGRID_REDIR_PHISH 2.285
score SERGIO_SUBJECT_VIAGRA01 0.001
score SHOPIFY_IMG_NOT_RCVD_SFY 0.001
score SHORTENER_SHORT_IMG 2.500
-score SHORT_BODY_G_DRIVE_DYN 0.688
+score SHORT_BODY_G_DRIVE_DYN 1.499
score SHORT_SHORTNER 1.999
-score SINGLETS_LOW_CONTRAST 0.440
-score SPOOFED_FREEMAIL 1.503
+score SINGLETS_LOW_CONTRAST 0.902
+score SPOOFED_FREEMAIL 1.501
score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 2.494
-score SPOOFED_FREEM_REPTO_CHN 2.714
+score SPOOFED_FREEM_REPTO 2.499
+score SPOOFED_FREEM_REPTO_CHN 1.857
score STATIC_XPRIO_OLE 1.999
score SUBJ_OBFU_PUNCT_FEW 0.749
-score SUBJ_OBFU_PUNCT_MANY 1.749
+score SUBJ_OBFU_PUNCT_MANY 1.716
score SUBJ_UNNEEDED_HTML 2.399
-score THIS_AD 0.999
+score THIS_AD 1.099
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
-score TO_EQ_FM_DIRECT_MX 1.530
-score TO_EQ_FM_DOM_HTML_IMG 0.684
-score TO_EQ_FM_DOM_HTML_ONLY 1.155
+score TO_EQ_FM_DIRECT_MX 1.567
+score TO_EQ_FM_DOM_HTML_IMG 0.250
+score TO_EQ_FM_DOM_HTML_ONLY 1.398
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_ONLY 0.281
+score TO_EQ_FM_HTML_ONLY 0.899
score TO_EQ_FM_SPF_FAIL 0.001
-score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 1.767
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score TO_IN_SUBJ 0.099
+score TO_NAME_SUBJ_NO_RDNS 1.611
+score TO_NO_BRKTS_FROM_MSSP 2.500
score TO_NO_BRKTS_HTML_IMG 0.001
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 1.945
-score TO_NO_BRKTS_NORDNS_HTML 1.680
-score TO_NO_BRKTS_PCNT 2.499
-score TVD_IP_HEX 0.475
-score TVD_IP_SING_HEX 2.288
-score TVD_RCVD_SPACE_BRACKET 1.470
-score TVD_SPACE_ENCODED 2.060
+score TO_NO_BRKTS_MSFT 1.892
+score TO_NO_BRKTS_NORDNS_HTML 1.732
+score TO_NO_BRKTS_PCNT 2.500
+score TVD_IP_HEX 0.721
+score TVD_IP_SING_HEX 1.268
+score TVD_RCVD_SPACE_BRACKET 1.366
+score TVD_SPACE_ENCODED 2.306
score TVD_SPACE_RATIO_MINFP 2.499
-score TVD_SUBJ_NUM_OBFU_MINFP 1.551
-score UPGRADE_MAILBOX 1.140
+score TVD_SUBJ_NUM_OBFU_MINFP 1.232
+score UPGRADE_MAILBOX 1.134
score URI_DOTEDU 1.999
-score URI_GOOGLE_PROXY 0.630
+score URI_GOOGLE_PROXY 0.631
score URI_ONLY_MSGID_MALF 0.001
score URI_PHISH 3.400
-score URI_PHP_REDIR 3.500
-score URI_TRY_3LD 1.539
-score URI_WPADMIN 0.939
+score URI_PHP_REDIR 3.499
+score URI_TRY_3LD 1.540
+score URI_WPADMIN 0.834
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 2.499
+score URI_WP_HACKED_2 2.500
score XPRIO_SHORT_SUBJ 2.499
-score XPRIO_URL_SHORTNER 0.999
+score XPRIO_URL_SHORTNER 1.000
score YOU_INHERIT 0.001
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
@@ -312,7 +313,6 @@
score PDS_HELO_SPF_FAIL 1.000
score PHOTO_EDITING_DIRECT 1.000
score PHP_NOVER_MUA 1.000
-score PHP_ORIG_SCRIPT 1.000
score PHP_SCRIPT_MUA 1.000
score PP_TOO_MUCH_UNICODE02 0.500
score PP_TOO_MUCH_UNICODE05 1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index b238527..d11339d 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -5,209 +5,209 @@
score AC_DIV_BONANZA 0.001
score AC_FROM_MANY_DOTS 2.999
score AC_HTML_NONSENSE_TAGS 1.999
-score ADVANCE_FEE_2_NEW_MONEY 1.173
-score ADVANCE_FEE_3_NEW 2.598
-score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW 2.499
+score ADVANCE_FEE_2_NEW_MONEY 1.172
+score ADVANCE_FEE_3_NEW 2.601
+score ADVANCE_FEE_3_NEW_MONEY 0.292
+score ADVANCE_FEE_4_NEW 2.599
score ADVANCE_FEE_5_NEW 3.199
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 2.290
score ALIBABA_IMG_NOT_RCVD_ALI 2.499
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score APP_DEVELOPMENT_NORDNS 1.618
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.580
+score APP_DEVELOPMENT_NORDNS 1.625
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 # force non-zero
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.366
score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 2.101
+score BITCOIN_EXTORT_01 2.111
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_SPAM_02 2.401
+score BITCOIN_SPAM_02 2.406
score BITCOIN_SPAM_03 2.499
-score BITCOIN_SPAM_07 3.482
+score BITCOIN_SPAM_07 3.320
score BITCOIN_XPRIO 0.001
-score BITCOIN_YOUR_INFO 1.102
+score BITCOIN_YOUR_INFO 0.001
score BODY_EMPTY 1.999
score BODY_SINGLE_URI 2.499
-score BODY_SINGLE_WORD 0.303
-score BODY_URI_ONLY 1.499
+score BODY_SINGLE_WORD 0.301
+score BODY_URI_ONLY 1.500
score BOGUS_MIME_VERSION 3.499
-score BOGUS_MSM_HDRS 0.821
+score BOGUS_MSM_HDRS 0.520
score CK_HELO_GENERIC 0.249
score CTE_8BIT_MISMATCH 0.999
score DATE_IN_FUTURE_96_Q 2.799
score DEAR_BENEFICIARY 0.001
score DSN_NO_MIMEVERSION 1.999
-score END_FUTURE_EMAILS 1.935
+score END_FUTURE_EMAILS 1.852
score FAKE_REPLY_A1 3.599
-score FAKE_REPLY_B 2.809
+score FAKE_REPLY_B 2.995
score FILL_THIS_FORM 0.001
-score FONT_INVIS_DIRECT 2.404
+score FONT_INVIS_DIRECT 2.393
score FONT_INVIS_MSGID 2.499
-score FONT_INVIS_NORDNS 0.378
+score FONT_INVIS_NORDNS 0.350
score FORGED_RELAY_MUA_TO_MX 3.899
score FORM_FRAUD 0.001
score FORM_FRAUD_3 0.001
-score FORM_FRAUD_5 0.205
+score FORM_FRAUD_5 0.554
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
-score FROM_2_EMAILS_SHORT 1.999
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FROM_2_EMAILS_SHORT 1.951
score FROM_ADDR_WS 2.999
score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 0.001
+score FROM_MISSP_DYNIP 0.001 # force non-zero
score FROM_MISSP_EH_MATCH 1.999
score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_REPLYTO 0.001
+score FROM_MISSP_REPLYTO 0.001 # force non-zero
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 2.499
-score FROM_NAME_EQ_TO_G_DRIVE 1.499
-score FROM_NTLD_LINKBAIT 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.324
+score FROM_NAME_EQ_TO_G_DRIVE 1.189
+score FROM_NTLD_LINKBAIT 1.158
+score FROM_NTLD_REPLY_FREEMAIL 1.933
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 2.000
-score FROM_WSP_TRAIL 0.729
+score FROM_SUSPICIOUS_NTLD_FP 1.999
+score FROM_WSP_TRAIL 0.731
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FUZZY_WALLET 2.399
-score GB_BITCOIN_CP 2.491
+score FUZZY_WALLET 2.400
+score GB_BITCOIN_CP 2.024
score GB_FREEMAIL_DISPTO 0.001
score GB_GOOGLE_OBFUS 0.749
score GOOGLE_DOC_SUSP 2.499
-score GOOG_REDIR_NORDNS 1.503
+score GOOG_REDIR_NORDNS 2.003
score GOOG_REDIR_SHORT 2.599
-score GOOG_STO_IMG_HTML 2.695
-score GOOG_STO_NOIMG_HTML 3.000
-score HDRS_LCASE 0.099
+score GOOG_STO_IMG_HTML 2.648
+score GOOG_STO_NOIMG_HTML 2.999
+score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
score HDR_ORDER_FTSDMCXX_DIRECT 1.999
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
-score HELO_MISC_IP 0.004
-score HELO_NO_DOMAIN 0.136
+score HELO_MISC_IP 0.003
+score HELO_NO_DOMAIN 0.139
score HEXHASH_WORD 2.999
-score HK_NAME_MR_MRS 0.792
-score HK_RANDOM_FROM 1.000
+score HK_NAME_MR_MRS 0.793
+score HK_RANDOM_FROM 0.999
score HK_RANDOM_REPLYTO 0.999
score HK_RCVD_IP_MULTICAST 1.999
score HK_SCAM 0.001
-score HOSTED_IMG_DIRECT_MX 3.465
+score HOSTED_IMG_DIRECT_MX 3.475
score HOSTED_IMG_FREEM 3.499
-score HTML_SINGLET_MANY 0.534
+score HTML_SINGLET_MANY 0.500
score HTML_TEXT_INVISIBLE_FONT 1.999
-score HTML_TEXT_INVISIBLE_STYLE 0.390
-score IMG_ONLY_FM_DOM_INFO 2.499
+score HTML_TEXT_INVISIBLE_STYLE 0.352
+score IMG_ONLY_FM_DOM_INFO 2.500
score KB_FORGED_MOZ4 2.899
score KHOP_FAKE_EBAY 0.399
-score KHOP_HELO_FCRDNS 0.400
-score LIST_PRTL_SAME_USER 0.703
+score KHOP_HELO_FCRDNS 0.399
+score LIST_PRTL_SAME_USER 0.001
score LONG_HEX_URI 2.199
-score LONG_IMG_URI 1.168
+score LONG_IMG_URI 1.655
score LONG_INVISIBLE_TEXT 0.001
score LOTS_OF_MONEY 0.010
-score LUCRATIVE 2.000
-score MANY_HDRS_LCASE 0.099
+score LUCRATIVE 1.999
+score MANY_HDRS_LCASE 0.064
score MANY_SPAN_IN_TEXT 2.299
-score MAY_BE_FORGED 1.791
-score MILLION_HUNDRED 3.000
+score MAY_BE_FORGED 1.792
+score MILLION_HUNDRED 2.999
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 0.001
-score MIXED_ES 3.200
+score MIXED_ES 3.299
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 2.414
-score MONEY_FORM_SHORT 0.793
+score MONEY_FORM 2.419
+score MONEY_FORM_SHORT 0.762
score MONEY_FRAUD_3 2.599
score MONEY_FRAUD_5 0.001
score MONEY_FRAUD_8 3.099
score MONEY_FREEMAIL_REPTO 2.999
-score MONEY_FROM_MISSP 0.793
-score MSGID_DOLLARS_URI_IMG 2.999
-score MSGID_NOFQDN1 1.435
-score MSMAIL_PRI_ABNORMAL 0.862
-score MSM_PRIO_REPTO 1.144
-score NAME_EMAIL_DIFF 1.329
+score MONEY_FROM_MISSP 0.790
+score MSGID_DOLLARS_URI_IMG 3.000
+score MSGID_NOFQDN1 1.430
+score MSMAIL_PRI_ABNORMAL 0.227
+score MSM_PRIO_REPTO 1.540
+score NAME_EMAIL_DIFF 1.786
score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 1.250
+score NORDNS_LOW_CONTRAST 1.285
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 0.435
-score NUMBEREND_LINKBAIT 0.034
-score NUMBERONLY_BITCOIN_EXP 0.721
-score OFFER_ONLY_AMERICA 0.493
+score NSL_RCVD_HELO_USER 0.810
+score NUMBEREND_LINKBAIT 0.964
+score NUMBERONLY_BITCOIN_EXP 1.122
+score OFFER_ONLY_AMERICA 0.494
score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.001
-score PDS_DBL_URL_ILLEGAL_CHARS 0.542
+score PDS_DBL_URL_ILLEGAL_CHARS 0.001
score PDS_DBL_URL_TNB_RUNON 1.999
score PDS_EMPTYSUBJ_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 1.594
+score PDS_FROM_2_EMAILS 1.550
score PDS_FROM_NAME_TO_DOMAIN 0.999
-score PDS_NAKED_TO_NUMERO 2.000
+score PDS_NAKED_TO_NUMERO 1.999
score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
-score PDS_OTHER_BAD_TLD 2.000
+score PDS_OTHER_BAD_TLD 1.999
score PDS_RDNS_DYNAMIC_FP 0.001 # force non-zero
score PDS_SHORT_SPOOFED_URL 1.999
score PDS_TINYSUBJ_URISHRT 1.499
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 2.000
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000
-score PDS_TO_EQ_FROM_NAME 0.074
-score PHP_ORIG_SCRIPT 0.389
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
+score PDS_TO_EQ_FROM_NAME 0.001
+score PHP_ORIG_SCRIPT 0.351
score PHP_SCRIPT 2.499
-score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RATWARE_NO_RDNS 1.207
-score RDNS_NUM_TLD_XM 2.999
+score PP_MIME_FAKE_ASCII_TEXT 1.000
+score RATWARE_NO_RDNS 1.680
+score RDNS_NUM_TLD_XM 3.000
score RISK_FREE 3.599
score SENDGRID_REDIR 1.499
-score SENDGRID_REDIR_PHISH 2.574
-score SERGIO_SUBJECT_VIAGRA01 0.034
+score SENDGRID_REDIR_PHISH 3.090
+score SERGIO_SUBJECT_VIAGRA01 0.025
score SHOPIFY_IMG_NOT_RCVD_SFY 2.499
-score SHORTENER_SHORT_IMG 0.698
-score SHORT_BODY_G_DRIVE_DYN 0.001
-score SHORT_IMG_SUSP_NTLD 1.499
+score SHORTENER_SHORT_IMG 0.705
+score SHORT_BODY_G_DRIVE_DYN 0.952
+score SHORT_IMG_SUSP_NTLD 0.648
score SHORT_SHORTNER 1.999
-score SINGLETS_LOW_CONTRAST 0.001
+score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 1.500
-score STATIC_XPRIO_OLE 2.000
-score STOCK_LOW_CONTRAST 0.636
-score SUBJ_OBFU_PUNCT_FEW 0.488
-score SUBJ_OBFU_PUNCT_MANY 0.862
-score SUBJ_UNNEEDED_HTML 1.803
+score STATIC_XPRIO_OLE 1.999
+score STOCK_LOW_CONTRAST 0.602
+score SUBJ_OBFU_PUNCT_FEW 0.469
+score SUBJ_OBFU_PUNCT_MANY 0.882
+score SUBJ_UNNEEDED_HTML 2.139
score THIS_AD 1.099
score THIS_IS_ADV_SUSP_NTLD 0.001 # force non-zero
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
score TO_EQ_FM_DIRECT_MX 0.001
-score TO_EQ_FM_DOM_HTML_IMG 0.175
-score TO_EQ_FM_DOM_HTML_ONLY 0.707
-score TO_EQ_FM_HTML_ONLY 0.203
+score TO_EQ_FM_DOM_HTML_IMG 0.201
+score TO_EQ_FM_DOM_HTML_ONLY 1.152
+score TO_EQ_FM_HTML_ONLY 0.433
score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 2.493
+score TO_NAME_SUBJ_NO_RDNS 2.499
score TO_NO_BRKTS_FROM_MSSP 2.499
score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
score TO_NO_BRKTS_MSFT 2.499
score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TO_NO_BRKTS_PCNT 1.961
-score TVD_IP_HEX 1.831
-score TVD_IP_SING_HEX 2.216
+score TO_NO_BRKTS_PCNT 1.562
+score TVD_IP_HEX 1.326
+score TVD_IP_SING_HEX 2.485
score TVD_RCVD_SPACE_BRACKET 3.399
score TVD_SPACE_ENCODED 2.499
score TVD_SPACE_RATIO_MINFP 2.499
-score TVD_SUBJ_NUM_OBFU_MINFP 2.604
-score UPGRADE_MAILBOX 0.519
+score TVD_SUBJ_NUM_OBFU_MINFP 1.742
+score UPGRADE_MAILBOX 0.025
score URI_DOTEDU 1.999
-score URI_GOOGLE_PROXY 2.087
-score URI_ONLY_MSGID_MALF 1.701
-score URI_PHISH 3.052
+score URI_GOOGLE_PROXY 2.083
+score URI_ONLY_MSGID_MALF 1.674
+score URI_PHISH 3.049
score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.011
+score URI_TRY_3LD 1.505
score URI_WPADMIN 0.787
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
score URI_WP_HACKED_2 2.499
score XPRIO 2.249
-score XPRIO_SHORT_SUBJ 1.560
-score XPRIO_URL_SHORTNER 0.503
+score XPRIO_SHORT_SUBJ 2.349
+score XPRIO_URL_SHORTNER 0.502
score YOU_INHERIT 0.001
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index bff293c..9ddeb93 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -3,222 +3,223 @@
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
-score AC_FROM_MANY_DOTS 0.640
-score AC_HTML_NONSENSE_TAGS 2.000
+score AC_FROM_MANY_DOTS 0.649
+score AC_HTML_NONSENSE_TAGS 1.999
score ADVANCE_FEE_2_NEW_MONEY 0.001
-score ADVANCE_FEE_3_NEW 3.467
-score ADVANCE_FEE_3_NEW_MONEY 0.001
+score ADVANCE_FEE_3_NEW 3.468
+score ADVANCE_FEE_3_NEW_MONEY 0.019
score ADVANCE_FEE_4_NEW 0.001
-score ADVANCE_FEE_5_NEW 2.999
+score ADVANCE_FEE_5_NEW 2.897
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
-score ALIBABA_IMG_NOT_RCVD_ALI 2.500
+score ALIBABA_IMG_NOT_RCVD_ALI 2.499
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 1.283
-score BITCOIN_DEADLINE 0.898
-score BITCOIN_EXTORT_01 3.334
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.481
+score BITCOIN_DEADLINE 0.852
+score BITCOIN_EXTORT_01 3.399
score BITCOIN_MALF_HTML 3.499
score BITCOIN_SPAM_02 2.499
score BITCOIN_SPAM_03 2.499
score BITCOIN_SPAM_05 2.499
-score BITCOIN_SPAM_07 1.842
+score BITCOIN_SPAM_07 2.857
score BITCOIN_XPRIO 0.001
score BITCOIN_YOUR_INFO 0.001
score BODY_EMPTY 1.999
-score BODY_SINGLE_URI 2.500
+score BODY_SINGLE_URI 2.499
score BODY_SINGLE_WORD 0.001
score BODY_URI_ONLY 1.499
score BOGUS_MIME_VERSION 3.499
-score BOGUS_MSM_HDRS 2.172
+score BOGUS_MSM_HDRS 1.525
score CK_HELO_GENERIC 0.001
score CTE_8BIT_MISMATCH 0.999
score DATE_IN_FUTURE_96_Q 2.799
-score DEAR_BENEFICIARY 0.001 # force non-zero
+score DEAR_BENEFICIARY 0.001
score DKIMWL_BL 2.999
-score DKIMWL_WL_HIGH -0.001 # force non-zero
+score DKIMWL_WL_HIGH -0.001
score DKIMWL_WL_MED -0.001
score DKIMWL_WL_MEDHI -0.001
score DSN_NO_MIMEVERSION 1.999
-score FAKE_REPLY_A1 3.500
-score FAKE_REPLY_B 0.475
+score FAKE_REPLY_A1 3.499
+score FAKE_REPLY_B 0.001
score FILL_THIS_FORM 0.001
-score FONT_INVIS_DIRECT 0.268
-score FONT_INVIS_MSGID 1.078
-score FONT_INVIS_NORDNS 2.273
-score FORGED_RELAY_MUA_TO_MX 3.597
+score FONT_INVIS_DIRECT 0.022
+score FONT_INVIS_MSGID 1.318
+score FONT_INVIS_NORDNS 2.277
+score FORGED_RELAY_MUA_TO_MX 3.655
score FORGED_SPF_HELO 1.199
score FORM_FRAUD 0.001
-score FORM_FRAUD_3 2.251
-score FORM_FRAUD_5 0.001 # force non-zero
+score FORM_FRAUD_3 2.399
+score FORM_FRAUD_5 0.001
score FREEMAIL_FORGED_FROMDOMAIN 0.250
score FROM_2_EMAILS_SHORT 1.999
score FROM_ADDR_WS 2.999
-score FROM_FMBLA_NEWDOM 1.500
+score FROM_FMBLA_NEWDOM 1.499
score FROM_FMBLA_NEWDOM14 0.999
score FROM_FMBLA_NEWDOM28 0.799
score FROM_GOV_DKIM_AU -0.001
score FROM_GOV_SPOOF 0.999
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.536
+score FROM_MISSP_DYNIP 1.527
score FROM_MISSP_EH_MATCH 0.001
score FROM_MISSP_FREEMAIL 0.001
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_REPLYTO 0.001
-score FROM_MISSP_SPF_FAIL 0.001
-score FROM_MISSP_USER 0.001
-score FROM_MISSP_XPRIO 2.499
-score FROM_NAME_EQ_TO_G_DRIVE 0.612
-score FROM_NTLD_LINKBAIT 1.999
-score FROM_NTLD_REPLY_FREEMAIL 1.109
+score FROM_MISSP_SPF_FAIL 0.001 # force non-zero
+score FROM_MISSP_USER 0.001 # force non-zero
+score FROM_MISSP_XPRIO 2.495
+score FROM_NAME_EQ_TO_G_DRIVE 1.124
+score FROM_NTLD_LINKBAIT 1.113
+score FROM_NTLD_REPLY_FREEMAIL 0.966
score FROM_PAYPAL_SPOOF 0.001
score FROM_SUSPICIOUS_NTLD 0.499
score FROM_SUSPICIOUS_NTLD_FP 1.286
-score FROM_WSP_TRAIL 1.676
-score FSL_BULK_SIG 0.001
+score FROM_WSP_TRAIL 1.068
+score FSL_BULK_SIG 0.001 # force non-zero
score FSL_CTYPE_WIN1251 0.001
-score FSL_NEW_HELO_USER 0.001
-score FUZZY_WALLET 1.514
-score GB_BITCOIN_CP 1.877
-score GB_FREEMAIL_DISPTO 0.001
+score FSL_NEW_HELO_USER 0.001 # force non-zero
+score FUZZY_WALLET 1.359
+score GB_BITCOIN_CP 1.361
+score GB_FREEMAIL_DISPTO 0.001 # force non-zero
score GB_GOOGLE_OBFUS 0.749
-score GOOGLE_DOC_SUSP 2.499
+score GOOGLE_DOC_SUSP 2.500
score GOOG_REDIR_NORDNS 2.899
-score GOOG_REDIR_SHORT 2.399
-score GOOG_STO_IMG_HTML 2.241
+score GOOG_REDIR_SHORT 2.499
+score GOOG_STO_IMG_HTML 1.321
score GOOG_STO_NOIMG_HTML 2.999
score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
-score HDR_ORDER_FTSDMCXX_DIRECT 1.324
+score HDR_ORDER_FTSDMCXX_DIRECT 1.710
score HDR_ORDER_FTSDMCXX_NORDNS 0.001
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
-score HELO_MISC_IP 0.001
+score HELO_MISC_IP 0.001 # force non-zero
score HELO_NO_DOMAIN 0.001
score HK_NAME_MR_MRS 0.001
score HK_RANDOM_FROM 0.001
score HK_RANDOM_REPLYTO 0.999
score HK_RCVD_IP_MULTICAST 1.999
score HK_SCAM 0.001
-score HOSTED_IMG_DIRECT_MX 3.434
-score HOSTED_IMG_FREEM 2.891
+score HOSTED_IMG_DIRECT_MX 1.172
+score HOSTED_IMG_FREEM 2.892
score HTML_SINGLET_MANY 2.499
score HTML_TEXT_INVISIBLE_FONT 1.999
-score HTML_TEXT_INVISIBLE_STYLE 1.582
-score IMG_ONLY_FM_DOM_INFO 1.581
-score KB_FORGED_MOZ4 0.569
-score KHOP_FAKE_EBAY 0.326
-score KHOP_HELO_FCRDNS 0.400
-score LIST_PRTL_SAME_USER 1.501
-score LONG_HEX_URI 2.409
-score LONG_IMG_URI 2.934
-score LONG_INVISIBLE_TEXT 0.143
+score HTML_TEXT_INVISIBLE_STYLE 1.590
+score IMG_ONLY_FM_DOM_INFO 1.588
+score KB_FORGED_MOZ4 0.616
+score KHOP_FAKE_EBAY 0.561
+score KHOP_HELO_FCRDNS 0.399
+score LIST_PRTL_SAME_USER 1.074
+score LONG_HEX_URI 1.552
+score LONG_IMG_URI 2.941
+score LONG_INVISIBLE_TEXT 0.147
score LOTS_OF_MONEY 0.010
score LUCRATIVE 1.999
score MANY_HDRS_LCASE 0.100
-score MANY_SPAN_IN_TEXT 2.199
+score MANY_SPAN_IN_TEXT 2.299
score MAY_BE_FORGED 2.199
-score MILLION_HUNDRED 2.699
+score MILLION_HUNDRED 2.799
score MIMEOLE_DIRECT_TO_MX 0.001
-score MIME_NO_TEXT 0.001
-score MIXED_ES 3.099
-score MONEY_ATM_CARD 0.001 # force non-zero
-score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 2.399
+score MIME_NO_TEXT 0.001 # force non-zero
+score MIXED_ES 2.999
+score MONEY_ATM_CARD 0.001
+score MONEY_FORM 0.001 # force non-zero
+score MONEY_FORM_SHORT 0.007
+score MONEY_FRAUD_3 2.499
score MONEY_FRAUD_5 0.001
score MONEY_FRAUD_8 2.899
-score MONEY_FREEMAIL_REPTO 2.436
+score MONEY_FREEMAIL_REPTO 2.408
score MONEY_FROM_MISSP 0.001
score MSGID_DOLLARS_URI_IMG 2.999
-score MSGID_NOFQDN1 1.836
+score MSGID_NOFQDN1 1.846
score MSMAIL_PRI_ABNORMAL 0.001
-score MSM_PRIO_REPTO 1.815
-score NAME_EMAIL_DIFF 0.940
+score MSM_PRIO_REPTO 1.867
+score NAME_EMAIL_DIFF 0.779
score NA_DOLLARS 1.499
score NICE_REPLY_A -0.001
score NORDNS_LOW_CONTRAST 0.001
score NO_FM_NAME_IP_HOSTN 0.001
-score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 2.399
+score NSL_RCVD_FROM_USER 0.001 # force non-zero
+score NSL_RCVD_HELO_USER 1.667
score NUMBEREND_LINKBAIT 0.999
-score NUMBERONLY_BITCOIN_EXP 1.749
+score NUMBERONLY_BITCOIN_EXP 1.560
score OFFER_ONLY_AMERICA 0.001 # force non-zero
-score PDS_BTC_ID 0.391
+score PDS_BTC_ID 0.326
score PDS_BTC_MSGID 0.001
-score PDS_DBL_URL_ILLEGAL_CHARS 0.888
+score PDS_DBL_URL_ILLEGAL_CHARS 1.620
score PDS_DBL_URL_TNB_RUNON 1.999
-score PDS_EMPTYSUBJ_URISHRT 1.499
+score PDS_EMPTYSUBJ_URISHRT 1.498
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 0.562
-score PDS_FROM_NAME_TO_DOMAIN 0.999
-score PDS_NAKED_TO_NUMERO 1.999
+score PDS_FROM_2_EMAILS 0.722
+score PDS_FROM_NAME_TO_DOMAIN 1.000
+score PDS_NAKED_TO_NUMERO 1.997
score PDS_NO_FULL_NAME_SPOOFED_URL 0.749
-score PDS_OTHER_BAD_TLD 1.944
+score PDS_OTHER_BAD_TLD 1.879
score PDS_RDNS_DYNAMIC_FP 0.001 # force non-zero
score PDS_SHORT_SPOOFED_URL 1.999
-score PDS_TINYSUBJ_URISHRT 0.282
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 2.000
+score PDS_TINYSUBJ_URISHRT 0.276
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_SHORT 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PDS_TO_EQ_FROM_NAME 0.940
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000
+score PDS_TO_EQ_FROM_NAME 0.782
+score PHP_ORIG_SCRIPT 0.001 # force non-zero
score PHP_SCRIPT 2.499
-score PP_MIME_FAKE_ASCII_TEXT 0.116
-score RATWARE_NO_RDNS 2.471
+score PP_MIME_FAKE_ASCII_TEXT 0.111
+score RATWARE_NO_RDNS 2.232
score RCVD_DOTEDU_SHORT 2.499
score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_XM 1.958
+score RDNS_NUM_TLD_XM 2.512
score RISK_FREE 3.399
score SENDGRID_REDIR 1.499
-score SENDGRID_REDIR_PHISH 2.766
+score SENDGRID_REDIR_PHISH 2.285
score SERGIO_SUBJECT_VIAGRA01 0.001
score SHOPIFY_IMG_NOT_RCVD_SFY 0.001
score SHORTENER_SHORT_IMG 2.500
-score SHORT_BODY_G_DRIVE_DYN 0.688
+score SHORT_BODY_G_DRIVE_DYN 1.499
score SHORT_SHORTNER 1.999
-score SINGLETS_LOW_CONTRAST 0.440
-score SPOOFED_FREEMAIL 1.503
+score SINGLETS_LOW_CONTRAST 0.902
+score SPOOFED_FREEMAIL 1.501
score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 2.494
-score SPOOFED_FREEM_REPTO_CHN 2.714
+score SPOOFED_FREEM_REPTO 2.499
+score SPOOFED_FREEM_REPTO_CHN 1.857
score STATIC_XPRIO_OLE 1.999
score SUBJ_OBFU_PUNCT_FEW 0.749
-score SUBJ_OBFU_PUNCT_MANY 1.749
+score SUBJ_OBFU_PUNCT_MANY 1.716
score SUBJ_UNNEEDED_HTML 2.399
-score THIS_AD 0.999
+score THIS_AD 1.099
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
-score TO_EQ_FM_DIRECT_MX 1.530
-score TO_EQ_FM_DOM_HTML_IMG 0.684
-score TO_EQ_FM_DOM_HTML_ONLY 1.155
+score TO_EQ_FM_DIRECT_MX 1.567
+score TO_EQ_FM_DOM_HTML_IMG 0.250
+score TO_EQ_FM_DOM_HTML_ONLY 1.398
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_ONLY 0.281
+score TO_EQ_FM_HTML_ONLY 0.899
score TO_EQ_FM_SPF_FAIL 0.001
-score TO_IN_SUBJ 0.100
-score TO_NAME_SUBJ_NO_RDNS 1.767
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score TO_IN_SUBJ 0.099
+score TO_NAME_SUBJ_NO_RDNS 1.611
+score TO_NO_BRKTS_FROM_MSSP 2.500
score TO_NO_BRKTS_HTML_IMG 0.001
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 1.945
-score TO_NO_BRKTS_NORDNS_HTML 1.680
-score TO_NO_BRKTS_PCNT 2.499
-score TVD_IP_HEX 0.475
-score TVD_IP_SING_HEX 2.288
-score TVD_RCVD_SPACE_BRACKET 1.470
-score TVD_SPACE_ENCODED 2.060
+score TO_NO_BRKTS_MSFT 1.892
+score TO_NO_BRKTS_NORDNS_HTML 1.732
+score TO_NO_BRKTS_PCNT 2.500
+score TVD_IP_HEX 0.721
+score TVD_IP_SING_HEX 1.268
+score TVD_RCVD_SPACE_BRACKET 1.366
+score TVD_SPACE_ENCODED 2.306
score TVD_SPACE_RATIO_MINFP 2.499
-score TVD_SUBJ_NUM_OBFU_MINFP 1.551
-score UPGRADE_MAILBOX 1.140
+score TVD_SUBJ_NUM_OBFU_MINFP 1.232
+score UPGRADE_MAILBOX 1.134
score URI_DOTEDU 1.999
-score URI_GOOGLE_PROXY 0.630
+score URI_GOOGLE_PROXY 0.631
score URI_ONLY_MSGID_MALF 0.001
score URI_PHISH 3.400
-score URI_PHP_REDIR 3.500
-score URI_TRY_3LD 1.539
-score URI_WPADMIN 0.939
+score URI_PHP_REDIR 3.499
+score URI_TRY_3LD 1.540
+score URI_WPADMIN 0.834
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 2.499
+score URI_WP_HACKED_2 2.500
score XPRIO_SHORT_SUBJ 2.499
-score XPRIO_URL_SHORTNER 0.999
+score XPRIO_URL_SHORTNER 1.000
score YOU_INHERIT 0.001
score AC_POST_EXTRAS 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000
@@ -312,7 +313,6 @@
score PDS_HELO_SPF_FAIL 1.000
score PHOTO_EDITING_DIRECT 1.000
score PHP_NOVER_MUA 1.000
-score PHP_ORIG_SCRIPT 1.000
score PHP_SCRIPT_MUA 1.000
score PP_TOO_MUCH_UNICODE02 0.500
score PP_TOO_MUCH_UNICODE05 1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index c4d5278..d182787 100644
--- a/rulesrc/scores/stats-set0
+++ b/rulesrc/scores/stats-set0
@@ -1,23 +1,23 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 177928 17.702% (99.615% of non-spam corpus)
-# Correctly spam: 710484 70.687% (85.964% of spam corpus)
-# False positives: 688 0.068% (0.385% of nonspam, 100580 weighted)
-# False negatives: 116007 11.542% (14.036% of spam, 260556 weighted)
-# Average score for spam: 13.4 nonspam: 0.8
-# Average for false-pos: 6.3 false-neg: 2.2
-# TOTAL: 1005107 100.00%
+# Correctly non-spam: 177950 17.705% (99.627% of non-spam corpus)
+# Correctly spam: 710954 70.736% (86.023% of spam corpus)
+# False positives: 666 0.066% (0.373% of nonspam, 98063 weighted)
+# False negatives: 115511 11.493% (13.977% of spam, 258141 weighted)
+# Average score for spam: 13.5 nonspam: 0.8
+# Average for false-pos: 6.4 false-neg: 2.2
+# TOTAL: 1005081 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
# Correctly non-spam: 22358 99.65%
-# Correctly spam: 88664 86.05%
+# Correctly spam: 88789 86.18%
# False positives: 79 0.35%
-# False negatives: 14368 13.95%
-# TCR(l=50): 5.624632 SpamRecall: 86.055% SpamPrec: 99.911%
+# False negatives: 14240 13.82%
+# TCR(l=50): 5.664046 SpamRecall: 86.179% SpamPrec: 99.911%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@
# SUMMARY for threshold 5.0:
# Correctly non-spam: 169075 94.66%
-# Correctly spam: 299762 36.27%
+# Correctly spam: 299690 36.26%
# False positives: 9541 5.34%
-# False negatives: 526729 63.73%
-# TCR(l=50): 0.823379 SpamRecall: 36.269% SpamPrec: 96.915%
+# False negatives: 526775 63.74%
+# TCR(l=50): 0.823316 SpamRecall: 36.262% SpamPrec: 96.915%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
# Correctly non-spam: 21241 94.67%
-# Correctly spam: 37197 36.10%
+# Correctly spam: 37331 36.23%
# False positives: 1196 5.33%
-# False negatives: 65835 63.90%
-# TCR(l=50): 0.820090 SpamRecall: 36.102% SpamPrec: 96.885%
+# False negatives: 65698 63.77%
+# TCR(l=50): 0.820961 SpamRecall: 36.233% SpamPrec: 96.896%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index 218a47d..21a95e5 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: 196151 15.614% (99.540% of non-spam corpus)
-# Correctly spam: 986363 78.515% (93.121% of spam corpus)
-# False positives: 906 0.072% (0.460% of nonspam, 325425 weighted)
-# False negatives: 72861 5.800% (6.879% of spam, 133148 weighted)
+# Correctly non-spam: 196149 15.614% (99.539% of non-spam corpus)
+# Correctly spam: 986780 78.549% (93.163% of spam corpus)
+# False positives: 908 0.072% (0.461% of nonspam, 325858 weighted)
+# False negatives: 72418 5.765% (6.837% of spam, 130633 weighted)
# Average score for spam: 14.9 nonspam: -0.7
# Average for false-pos: 6.7 false-neg: 1.8
-# TOTAL: 1256281 100.00%
+# TOTAL: 1256255 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 24513 99.52%
-# Correctly spam: 123228 93.19%
-# False positives: 119 0.48%
-# False negatives: 9002 6.81%
-# TCR(l=50): 8.843633 SpamRecall: 93.192% SpamPrec: 99.904%
+# Correctly non-spam: 24510 99.50%
+# Correctly spam: 123294 93.24%
+# False positives: 122 0.50%
+# False negatives: 8934 6.76%
+# TCR(l=50): 8.795264 SpamRecall: 93.243% SpamPrec: 99.901%
##### WITHOUT NEW RULES AND SCORES #####
Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@
# SUMMARY for threshold 5.0:
# Correctly non-spam: 194752 98.83%
-# Correctly spam: 488739 46.14%
+# Correctly spam: 488635 46.13%
# False positives: 2305 1.17%
-# False negatives: 570485 53.86%
-# TCR(l=50): 1.544655 SpamRecall: 46.141% SpamPrec: 99.531%
+# False negatives: 570563 53.87%
+# TCR(l=50): 1.544441 SpamRecall: 46.133% SpamPrec: 99.530%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
# Correctly non-spam: 24334 98.79%
-# Correctly spam: 60998 46.13%
+# Correctly spam: 61162 46.25%
# False positives: 298 1.21%
-# False negatives: 71232 53.87%
-# TCR(l=50): 1.535202 SpamRecall: 46.130% SpamPrec: 99.514%
+# False negatives: 71066 53.75%
+# TCR(l=50): 1.538143 SpamRecall: 46.255% SpamPrec: 99.515%
