updated scores for revision 1881867 active rules added since last mass-check
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1881877 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/scores/72_scores.cf b/rulesrc/scores/72_scores.cf
index 4d79183..191955f 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 1.285 2.999 1.285
-score AC_HTML_NONSENSE_TAGS 1.999 1.999 1.999 1.999
+score AC_FROM_MANY_DOTS 2.999 0.866 2.999 0.866
+score AC_HTML_NONSENSE_TAGS 2.000 1.999 2.000 1.999
score AC_POST_EXTRAS 2.499 0.001 2.499 0.001
score AC_SPAMMY_URI_PATTERNS1 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000 1.000 1.000 1.000
@@ -12,128 +12,128 @@
score AC_SPAMMY_URI_PATTERNS4 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS8 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS9 1.000 1.000 1.000 1.000
-score ADMITS_SPAM 1.849 0.001 1.849 0.001
+score ADMITS_SPAM 1.960 0.001 1.960 0.001
score ADVANCE_FEE_2_NEW_FORM 1.000 1.000 1.000 1.000
score ADVANCE_FEE_2_NEW_MONEY 1.999 1.999 1.999 1.999
-score ADVANCE_FEE_3_NEW 1.000 3.499 1.000 3.499
-score ADVANCE_FEE_3_NEW_MONEY 2.799 0.001 2.799 0.001
-score ADVANCE_FEE_4_NEW_MONEY 2.799 1.971 2.799 1.971
-score ADVANCE_FEE_5_NEW 1.897 2.699 1.897 2.699
+score ADVANCE_FEE_3_NEW 0.001 3.499 0.001 3.499
+score ADVANCE_FEE_3_NEW_MONEY 0.001 0.001 0.001 0.001
+score ADVANCE_FEE_4_NEW_MONEY 2.699 1.146 2.699 1.146
+score ADVANCE_FEE_5_NEW 2.899 2.699 2.899 2.699
score AD_PREFS 0.250 0.250 0.250 0.250
score ALIBABA_IMG_NOT_RCVD_ALI 1.000 1.000 1.000 1.000
-score AMAZON_IMG_NOT_RCVD_AMZN 2.500 2.499 2.500 2.499
+score AMAZON_IMG_NOT_RCVD_AMZN 2.499 2.499 2.499 2.499
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 AXB_XMAILER_MIMEOLE_OL_024C2 2.600 0.061 2.600 0.061
+score AXB_XMAILER_MIMEOLE_OL_024C2 2.498 0.001 2.498 0.001
score BITCOIN_BOMB 1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE 2.999 2.612 2.999 2.612
-score BITCOIN_EXTORT_01 3.892 4.059 3.892 4.059
+score BITCOIN_DEADLINE 2.952 2.760 2.952 2.760
+score BITCOIN_EXTORT_01 4.906 4.357 4.906 4.357
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 0.974 1.523 0.974 1.523
+score BITCOIN_SPAM_02 0.049 2.100 0.049 2.100
score BITCOIN_SPAM_03 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_04 1.500 1.499 1.500 1.499
-score BITCOIN_SPAM_05 0.001 1.093 0.001 1.093
+score BITCOIN_SPAM_04 1.499 1.498 1.499 1.498
+score BITCOIN_SPAM_05 0.001 2.455 0.001 2.455
score BITCOIN_SPAM_06 1.000 1.000 1.000 1.000
-score BITCOIN_SPAM_07 1.000 3.440 1.000 3.440
+score BITCOIN_SPAM_07 2.421 3.499 2.421 3.499
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 1.250 1.269 1.250 1.269
-score BITCOIN_YOUR_INFO 1.326 0.615 1.326 0.615
+score BITCOIN_XPRIO 0.001 1.258 0.001 1.258
+score BITCOIN_YOUR_INFO 1.500 0.462 1.500 0.462
score BODY_EMPTY 1.000 1.000 1.000 1.000
score BODY_URI_ONLY 0.999 0.001 0.999 0.001
-score BOGUS_MIME_VERSION 3.383 2.296 3.383 2.296
+score BOGUS_MIME_VERSION 3.377 3.499 3.377 3.499
score BOGUS_MSM_HDRS 1.000 1.000 1.000 1.000
score BOMB_FREEM 1.000 1.000 1.000 1.000
score BOMB_MONEY 1.000 1.000 1.000 1.000
score BTC_ORG 1.000 1.000 1.000 1.000
score BULK_RE_SUSP_NTLD 1.000 1.000 1.000 1.000
score CANT_SEE_AD 1.000 1.000 1.000 1.000
-score CK_HELO_DYNAMIC_SPLIT_IP 1.499 1.499 1.499 1.499
-score CK_HELO_GENERIC 0.249 0.250 0.249 0.250
+score CK_HELO_DYNAMIC_SPLIT_IP 1.500 1.498 1.500 1.498
+score CK_HELO_GENERIC 0.250 0.249 0.250 0.249
score COMMENT_GIBBERISH 1.000 1.000 1.000 1.000
-score COMPENSATION 1.000 1.000 1.000 1.000
-score CTE_8BIT_MISMATCH 1.000 1.000 1.000 1.000
-score CTYPE_NULL 2.603 2.399 2.603 2.399
+score COMPENSATION 1.499 1.000 1.499 1.000
+score CTE_8BIT_MISMATCH 0.999 0.999 0.999 0.999
+score CTYPE_NULL 2.117 2.499 2.117 2.499
score DAY_I_EARNED 1.000 1.000 1.000 1.000
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 -1.501 0.001 -1.501
+score DKIMWL_WL_HIGH 0.001 -1.455 0.001 -1.455
score DKIMWL_WL_MED 0.001 -0.001 0.001 -0.001
score DKIMWL_WL_MEDHI 0.001 -1.000 0.001 -1.000
score DOTGOV_IMAGE 2.999 2.999 2.999 2.999
score DSN_NO_MIMEVERSION 1.999 1.999 1.999 1.999
-score DX_TEXT_03 0.799 0.299 0.799 0.299
+score DX_TEXT_03 0.400 0.299 0.400 0.299
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 2.098 1.050 2.098 1.050
+score END_FUTURE_EMAILS 1.848 1.039 1.848 1.039
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.199 0.001 1.199 0.001
-score FONT_INVIS_DIRECT 1.438 0.001 1.438 0.001
-score FONT_INVIS_DOTGOV 1.112 0.001 1.112 0.001
-score FONT_INVIS_LONG_LINE 0.001 1.567 0.001 1.567
-score FONT_INVIS_MSGID 2.449 0.001 2.449 0.001
-score FONT_INVIS_POSTEXTRAS 0.001 0.001 0.001 0.001
-score FORGED_RELAY_MUA_TO_MX 4.099 3.715 4.099 3.715
-score FORGED_SPF_HELO 0.001 1.499 0.001 1.499
-score FORM_FRAUD 0.999 0.999 0.999 0.999
-score FORM_FRAUD_5 2.218 2.699 2.218 2.699
+score FILL_THIS_FORM 0.001 0.001 0.001 0.001
+score FONT_INVIS_DIRECT 2.599 0.001 2.599 0.001
+score FONT_INVIS_DOTGOV 0.114 0.001 0.114 0.001
+score FONT_INVIS_LONG_LINE 0.117 1.564 0.117 1.564
+score FONT_INVIS_MSGID 2.285 0.001 2.285 0.001
+score FONT_INVIS_POSTEXTRAS 1.788 2.411 1.788 2.411
+score FORGED_RELAY_MUA_TO_MX 3.999 3.670 3.999 3.670
+score FORM_FRAUD 0.999 0.998 0.999 0.998
+score FORM_FRAUD_3 2.400 0.001 2.400 0.001
+score FORM_FRAUD_5 2.999 2.699 2.999 2.699
score FORM_LOW_CONTRAST 1.000 1.000 1.000 1.000
score FOUND_YOU 3.249 3.249 3.249 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.250 0.250 0.250 0.250
+score FREEMAIL_FORGED_FROMDOMAIN 0.249 0.248 0.249 0.248
score FREEM_FRNUM_UNICD_EMPTY 1.000 1.000 1.000 1.000
score FRNAME_IN_MSG_XPRIO_NO_SUB 1.000 1.000 1.000 1.000
score FROM_2_EMAILS_SHORT 1.999 1.999 1.999 1.999
-score FROM_ADDR_WS 2.999 2.854 2.999 2.854
+score FROM_ADDR_WS 2.999 2.745 2.999 2.745
score FROM_BANK_NOAUTH 0.001 1.000 0.001 1.000
score FROM_FMBLA_NDBLOCKED 0.001 0.001 0.001 0.001
score FROM_FMBLA_NEWDOM 0.001 1.499 0.001 1.499
-score FROM_FMBLA_NEWDOM14 0.001 0.999 0.001 0.999
+score FROM_FMBLA_NEWDOM14 0.001 0.998 0.001 0.998
score FROM_FMBLA_NEWDOM28 0.001 0.649 0.001 0.649
-score FROM_GOV_DKIM_AU 0.001 -1.000 0.001 -1.000
+score FROM_GOV_DKIM_AU 0.001 -0.998 0.001 -0.998
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.329 1.513 0.329 1.513
-score FROM_MISSP_EH_MATCH 1.999 0.001 1.999 0.001
-score FROM_MISSP_FREEMAIL 2.000 0.143 2.000 0.143
-score FROM_MISSP_MSFT 0.543 0.001 0.543 0.001
-score FROM_MISSP_REPLYTO 2.499 0.001 2.499 0.001
+score FROM_MISSPACED 0.001 0.001 0.001 0.001
+score FROM_MISSP_DYNIP 0.087 2.599 0.087 2.599
+score FROM_MISSP_EH_MATCH 0.001 0.001 0.001 0.001
+score FROM_MISSP_FREEMAIL 2.999 2.347 2.999 2.347
+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 1.999 0.001 1.999
-score FROM_MISSP_TO_UNDISC 1.796 0.001 1.796 0.001
+score FROM_MISSP_TO_UNDISC 2.167 1.229 2.167 1.229
score FROM_MISSP_USER 0.001 0.001 0.001 0.001
-score FROM_MISSP_XPRIO 0.001 0.001 0.001 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 0.001 0.001 0.001 0.001
+score FROM_MISSP_XPRIO 0.490 0.001 0.490 0.001
+score FROM_NAME_EQ_TO_G_DRIVE 1.499 1.430 1.499 1.430
score FROM_NEWDOM_BTC 0.001 1.000 0.001 1.000
score FROM_NTLD_LINKBAIT 1.000 1.000 1.000 1.000
-score FROM_NTLD_REPLY_FREEMAIL 1.301 1.906 1.301 1.906
+score FROM_NTLD_REPLY_FREEMAIL 1.699 1.999 1.699 1.999
score FROM_NUMBERO_NEWDOMAIN 0.001 1.000 0.001 1.000
score FROM_PAYPAL_SPOOF 0.001 1.000 0.001 1.000
score FROM_SUSPICIOUS_NTLD 0.499 0.499 0.499 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.999 1.999 1.999 1.999
-score FROM_UNBAL1 1.996 2.344 1.996 2.344
-score FROM_URI 1.531 2.306 1.531 2.306
-score FROM_WORDY 0.001 2.081 0.001 2.081
+score FROM_SUSPICIOUS_NTLD_FP 2.000 1.997 2.000 1.997
+score FROM_UNBAL1 1.999 2.406 1.999 2.406
+score FROM_URI 0.498 1.346 0.498 1.346
+score FROM_WORDY 1.899 2.499 1.899 2.499
score FROM_WORDY_SHORT 1.000 1.000 1.000 1.000
-score FROM_WWW 2.255 2.442 2.255 2.442
+score FROM_WWW 1.040 2.399 1.040 2.399
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 FSL_THIS_IS_ADV 2.752 0.447 2.752 0.447
-score FUZZY_WALLET 0.001 2.199 0.001 2.199
+score FSL_THIS_IS_ADV 2.638 0.001 2.638 0.001
+score FUZZY_WALLET 2.399 2.199 2.399 2.199
score GAPPY_SALES_LEADS_FREEM 1.000 1.000 1.000 1.000
-score GB_BITCOIN_CP 1.756 1.767 1.756 1.767
+score GB_BITCOIN_CP 1.922 0.403 1.922 0.403
score GB_BITCOIN_NH 1.000 1.000 1.000 1.000
score GB_FORGED_MUA_POSTFIX 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO 0.499 0.001 0.499 0.001
+score GB_FREEMAIL_DISPTO 0.001 0.001 0.001 0.001
score GB_FREEMAIL_DISPTO_NOTFREEM 0.500 0.500 0.500 0.500
score GB_GOOGLE_OBFUR 0.750 0.750 0.750 0.750
score GB_GOOGLE_OBFUS 0.749 0.749 0.749 0.749
@@ -146,83 +146,84 @@
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 0.812 1.999 0.812
-score HDR_ORDER_FTSDMCXX_NORDNS 2.601 2.898 2.601 2.898
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250 0.249 0.250 0.249
-score HELO_MISC_IP 0.249 0.094 0.249 0.094
+score HDR_ORDER_FTSDMCXX_DIRECT 0.052 0.811 0.052 0.811
+score HDR_ORDER_FTSDMCXX_NORDNS 2.600 2.898 2.600 2.898
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249 0.249 0.249 0.249
+score HELO_MISC_IP 0.249 0.053 0.249 0.053
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_RANDOM_FROM 0.978 0.001 0.978 0.001
-score HK_RANDOM_REPLYTO 0.999 0.999 0.999 0.999
-score HK_RCVD_IP_MULTICAST 1.000 1.000 1.000 1.000
-score HK_SCAM 1.566 0.001 1.566 0.001
-score HOSTED_IMG_DIRECT_MX 3.499 1.750 3.499 1.750
+score HK_RANDOM_FROM 0.113 0.001 0.113 0.001
+score HK_RANDOM_REPLYTO 1.000 0.998 1.000 0.998
+score HK_RCVD_IP_MULTICAST 1.999 1.000 1.999 1.000
+score HK_SCAM 1.999 0.001 1.999 0.001
+score HOSTED_IMG_DIRECT_MX 3.499 1.558 3.499 1.558
score HOSTED_IMG_DQ_UNSUB 1.000 1.000 1.000 1.000
score HOSTED_IMG_FREEM 1.000 1.000 1.000 1.000
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 0.102 0.001 0.102 0.001
+score HTML_OFF_PAGE 0.599 0.001 0.599 0.001
score HTML_SHRT_CMNT_OBFU_MANY 1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY 0.247 0.001 0.247 0.001
-score HTML_TEXT_INVISIBLE_FONT 2.550 2.013 2.550 2.013
-score HTML_TEXT_INVISIBLE_STYLE 1.887 1.783 1.887 1.783
-score IMG_ONLY_FM_DOM_INFO 1.698 2.426 1.698 2.426
-score KB_FORGED_MOZ4 4.500 4.499 4.500 4.499
-score KHOP_FAKE_EBAY 0.187 0.899 0.187 0.899
-score KHOP_HELO_FCRDNS 0.399 0.400 0.399 0.400
-score LH_URI_DOM_IN_PATH 2.700 0.001 2.700 0.001
+score HTML_SINGLET_MANY 0.001 0.001 0.001 0.001
+score HTML_TEXT_INVISIBLE_FONT 1.750 2.003 1.750 2.003
+score HTML_TEXT_INVISIBLE_STYLE 0.001 2.533 0.001 2.533
+score IMG_ONLY_FM_DOM_INFO 0.001 2.442 0.001 2.442
+score KB_FORGED_MOZ4 4.263 4.499 4.263 4.499
+score KHOP_FAKE_EBAY 0.399 0.119 0.399 0.119
+score KHOP_HELO_FCRDNS 0.399 0.399 0.399 0.399
+score LH_URI_DOM_IN_PATH 2.499 0.001 2.499 0.001
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.001 1.818 0.001 1.818
-score LONG_HEX_URI 2.296 0.001 2.296 0.001
-score LONG_IMG_URI 1.000 0.001 1.000 0.001
-score LONG_INVISIBLE_TEXT 0.001 1.850 0.001 1.850
+score LIST_PRTL_SAME_USER 0.507 0.791 0.507 0.791
+score LONG_HEX_URI 1.787 0.001 1.787 0.001
+score LONG_IMG_URI 1.404 0.001 1.404 0.001
+score LONG_INVISIBLE_TEXT 2.999 1.848 2.999 1.848
score LOTS_OF_MONEY 0.010 0.010 0.010 0.010
score LUCRATIVE 1.000 1.000 1.000 1.000
score MALF_HTML_B64 1.000 1.000 1.000 1.000
score MALWARE_NORDNS 1.000 1.000 1.000 1.000
score MALWARE_PASSWORD 1.000 1.000 1.000 1.000
score MANY_HDRS_LCASE 0.100 0.100 0.100 0.100
-score MANY_SPAN_IN_TEXT 3.099 1.435 3.099 1.435
-score MILLION_HUNDRED 0.001 0.001 0.001 0.001
+score MANY_SPAN_IN_TEXT 2.800 1.435 2.800 1.435
+score MAY_BE_FORGED 1.788 0.001 1.788 0.001
+score MILLION_HUNDRED 0.175 0.001 0.175 0.001
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 2.699 2.499 2.699 2.499
+score MIXED_ES 2.699 2.497 2.699 2.497
score MONERO_DEADLINE 1.000 1.000 1.000 1.000
score MONERO_EXTORT_01 1.000 1.000 1.000 1.000
score MONERO_MALWARE 1.000 1.000 1.000 1.000
score MONERO_PAY_ME 1.000 1.000 1.000 1.000
-score MONEY_FORM_SHORT 1.698 0.001 1.698 0.001
-score MONEY_FRAUD_3 2.599 1.916 2.599 1.916
-score MONEY_FRAUD_5 2.599 0.710 2.599 0.710
-score MONEY_FRAUD_8 1.959 0.001 1.959 0.001
-score MONEY_FROM_MISSP 1.999 1.236 1.999 1.236
+score MONEY_FORM_SHORT 1.683 0.001 1.683 0.001
+score MONEY_FRAUD_3 2.499 1.907 2.499 1.907
+score MONEY_FRAUD_5 2.899 1.534 2.899 1.534
+score MONEY_FRAUD_8 0.001 0.001 0.001 0.001
+score MONEY_FROM_MISSP 1.999 0.001 1.999 0.001
score MSM_PRIO_REPTO 2.499 2.499 2.499 2.499
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000 1.000 1.000 1.000
-score NICE_REPLY_A -0.299 -0.001 -0.299 -0.001
-score NORDNS_LOW_CONTRAST 1.886 0.912 1.886 0.912
+score NICE_REPLY_A -0.001 -0.001 -0.001 -0.001
+score NORDNS_LOW_CONTRAST 1.783 0.910 1.783 0.910
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.830 0.650 0.830 0.650
+score NSL_RCVD_HELO_USER 0.553 0.174 0.553 0.174
score OBFU_BITCOIN 1.000 1.000 1.000 1.000
-score OFFER_ONLY_AMERICA 2.000 1.000 2.000 1.000
-score PDS_BTC_ID 0.500 0.499 0.500 0.499
-score PDS_BTC_MSGID 0.001 0.001 0.001 0.001
-score PDS_EMPTYSUBJ_URISHRT 1.499 0.001 1.499 0.001
+score OFFER_ONLY_AMERICA 0.106 1.000 0.106 1.000
+score PDS_BTC_ID 0.499 0.499 0.499 0.499
+score PDS_BTC_MSGID 0.001 0.011 0.001 0.011
+score PDS_EMPTYSUBJ_URISHRT 1.100 0.001 1.100 0.001
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499 1.499 1.499 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499 1.499 1.499 1.499
-score PDS_FROM_2_EMAILS 2.099 1.499 2.099 1.499
-score PDS_FROM_NAME_TO_DOMAIN 0.999 0.999 0.999 0.999
+score PDS_FROM_2_EMAILS 1.699 1.499 1.699 1.499
+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 1.999 1.999 1.999 1.999
score PDS_SHORTFWD_URISHRT 1.499 1.499 1.499 1.499
-score PDS_TINYSUBJ_URISHRT 1.499 0.567 1.499 0.567
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999 0.397 1.999 0.397
+score PDS_TINYSUBJ_URISHRT 1.500 0.592 1.500 0.592
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999 0.972 1.999 0.972
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999 1.999 1.999 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999 0.999 0.999 0.999
-score PDS_TO_EQ_FROM_NAME 0.001 3.399 0.001 3.399
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000 0.999 1.000 0.999
+score PDS_TO_EQ_FROM_NAME 3.379 3.399 3.379 3.399
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 2.499 2.499 2.499 2.499
@@ -233,85 +234,96 @@
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.008 0.977 1.008 0.977
-score RCVD_DOTEDU_SHORT 1.000 2.490 1.000 2.490
-score RCVD_DOTEDU_SUSP_URI 1.000 0.001 1.000 0.001
+score RATWARE_NO_RDNS 1.722 1.627 1.722 1.627
+score RCVD_DOTEDU_SHORT 2.499 2.401 2.499 2.401
+score RCVD_DOTEDU_SUSP_URI 0.304 0.001 0.304 0.001
+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.321 1.000 1.321
-score RISK_FREE 2.999 2.599 2.999 2.599
-score SENDGRID_REDIR 1.999 1.499 1.999 1.499
-score SENDGRID_REDIR_PHISH 3.499 3.499 3.499 3.499
+score RDNS_NUM_TLD_XM 2.999 0.352 2.999 0.352
+score RISK_FREE 2.899 2.699 2.899 2.699
+score SENDGRID_REDIR 1.499 1.498 1.499 1.498
+score SENDGRID_REDIR_PHISH 3.467 3.393 3.467 3.393
score SEO_SUSP_NTLD 1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_VIAGRA01 2.617 3.599 2.617 3.599
+score SERGIO_SUBJECT_VIAGRA01 3.299 3.599 3.299 3.599
score SHOPIFY_IMG_NOT_RCVD_SFY 1.000 1.000 1.000 1.000
score SHORTENED_URL_SRC 2.999 2.699 2.999 2.699
-score SHORTENER_SHORT_IMG 0.001 0.714 0.001 0.714
-score SHORT_BODY_G_DRIVE_DYN 1.046 0.823 1.046 0.823
+score SHORTENER_SHORT_IMG 0.001 1.728 0.001 1.728
+score SHORT_BODY_G_DRIVE_DYN 1.480 0.001 1.480 0.001
score SHORT_IMG_SUSP_NTLD 1.000 1.000 1.000 1.000
-score SHORT_SHORTNER 2.000 1.999 2.000 1.999
-score SHORT_URL 2.298 0.047 2.298 0.047
+score SHORT_SHORTNER 1.999 1.997 1.999 1.997
+score SHORT_URL 1.768 0.440 1.768 0.440
score SINGLETS_LOW_CONTRAST 0.001 0.001 0.001 0.001
-score SPOOFED_FREEMAIL 0.001 1.652 0.001 1.652
+score SPOOFED_FREEMAIL 0.001 1.997 0.001 1.997
score SPOOFED_FREEMAIL_NO_RDNS 1.499 0.001 1.499 0.001
-score SPOOFED_FREEM_REPTO 0.001 1.042 0.001 1.042
-score SPOOFED_FREEM_REPTO_CHN 0.001 1.296 0.001 1.296
+score SPOOFED_FREEM_REPTO 0.001 0.694 0.001 0.694
+score SPOOFED_FREEM_REPTO_CHN 0.001 0.660 0.001 0.660
score SPOOFED_FREEM_REPTO_RUS 0.001 1.000 0.001 1.000
score STATIC_XPRIO_OLE 1.999 1.999 1.999 1.999
-score STOCK_LOW_CONTRAST 2.500 0.055 2.500 0.055
+score STOCK_LOW_CONTRAST 2.499 0.001 2.499 0.001
score STOCK_TIP 1.000 1.000 1.000 1.000
-score STOX_BOUND_090909_B 1.936 2.399 1.936 2.399
-score SUBJ_OBFU_PUNCT_FEW 0.001 0.009 0.001 0.009
+score STOX_BOUND_090909_B 1.979 2.299 1.979 2.299
+score SUBJ_OBFU_PUNCT_FEW 0.026 0.008 0.026 0.008
score SUBJ_OBFU_PUNCT_MANY 1.749 0.001 1.749 0.001
+score SURBL_BLOCKED 0.001 0.001 0.001 0.001
score SUSP_UTF8_WORD_COMBO 0.001 2.999 0.001 2.999
-score SUSP_UTF8_WORD_FROM 0.450 1.999 0.450 1.999
-score SUSP_UTF8_WORD_SUBJ 1.999 1.999 1.999 1.999
+score SUSP_UTF8_WORD_FROM 0.644 1.999 0.644 1.999
+score SUSP_UTF8_WORD_SUBJ 2.000 1.999 2.000 1.999
score SYSADMIN 1.000 1.000 1.000 1.000
-score THIS_AD 1.299 0.899 1.299 0.899
+score THIS_AD 0.099 0.899 0.099 0.899
score THIS_IS_ADV_SUSP_NTLD 0.001 0.001 0.001 0.001
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499 0.505 1.499 0.505
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499 0.558 1.499 0.558
score TO_EQ_FM_DIRECT_MX 1.000 1.000 1.000 1.000
-score TO_EQ_FM_DOM_HTML_IMG 0.200 0.001 0.200 0.001
-score TO_EQ_FM_DOM_HTML_ONLY 0.890 1.071 0.890 1.071
+score TO_EQ_FM_DOM_HTML_IMG 0.001 0.600 0.001 0.600
+score TO_EQ_FM_DOM_HTML_ONLY 0.937 1.899 0.937 1.899
score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_ONLY 0.796 0.733 0.796 0.733
+score TO_EQ_FM_HTML_ONLY 0.337 0.332 0.337 0.332
score TO_EQ_FM_SPF_FAIL 0.001 0.001 0.001 0.001
score TO_IN_SUBJ 0.099 0.099 0.099 0.099
score TO_NAME_SUBJ_NO_RDNS 1.000 1.000 1.000 1.000
-score TO_NO_BRKTS_FROM_MSSP 2.499 2.499 2.499 2.499
-score TO_NO_BRKTS_HTML_IMG 1.000 1.787 1.000 1.787
+score TO_NO_BRKTS_FROM_MSSP 1.874 2.097 1.874 2.097
+score TO_NO_BRKTS_HTML_IMG 1.999 1.787 1.999 1.787
score TO_NO_BRKTS_HTML_ONLY 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_MSFT 2.500 0.407 2.500 0.407
-score TO_NO_BRKTS_NORDNS_HTML 1.999 1.999 1.999 1.999
-score TO_NO_BRKTS_PCNT 1.000 1.000 1.000 1.000
-score TVD_RCVD_SPACE_BRACKET 4.299 4.499 4.299 4.499
-score TVD_SPACE_ENCODED 1.103 2.195 1.103 2.195
-score TVD_SPACE_RATIO_MINFP 1.620 0.001 1.620 0.001
+score TO_NO_BRKTS_MSFT 2.499 0.001 2.499 0.001
+score TO_NO_BRKTS_NORDNS_HTML 0.253 1.997 0.253 1.997
+score TO_NO_BRKTS_PCNT 2.499 1.000 2.499 1.000
+score TVD_RCVD_SPACE_BRACKET 4.500 4.499 4.500 4.499
+score TVD_SPACE_ENCODED 2.499 1.779 2.499 1.779
+score TVD_SPACE_RATIO_MINFP 0.061 0.001 0.061 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 UNICODE_OBFU_ASC 1.000 2.500 1.000 2.500
+score UNICODE_OBFU_ASC 2.499 2.499 2.499 2.499
score UNICODE_OBFU_ZW 1.000 1.000 1.000 1.000
-score UPGRADE_MAILBOX 1.087 0.972 1.087 0.972
+score UPGRADE_MAILBOX 0.094 0.274 0.094 0.274
score URI_DATA 1.000 1.000 1.000 1.000
-score URI_DOTEDU 2.000 0.001 2.000 0.001
-score URI_DOTEDU_ENTITY 2.919 2.999 2.919 2.999
-score URI_DOTEDU_LONG 2.286 0.001 2.286 0.001
-score URI_GOOGLE_PROXY 0.839 0.133 0.839 0.133
+score URI_DOTEDU 1.999 0.001 1.999 0.001
+score URI_DOTEDU_ENTITY 2.999 2.999 2.999 2.999
+score URI_DOTEDU_LONG 0.001 0.001 0.001 0.001
+score URI_GOOGLE_PROXY 0.104 0.132 0.104 0.132
score URI_HEX_IP 1.000 1.000 1.000 1.000
-score URI_IMG_WP_REDIR 2.999 2.999 2.999 2.999
-score URI_IN_URI_10 2.203 3.693 2.203 3.693
-score URI_IN_URI_5 2.440 2.548 2.440 2.548
-score URI_ONLY_MSGID_MALF 1.999 1.813 1.999 1.813
+score URI_IMG_WP_REDIR 2.813 2.999 2.813 2.999
+score URI_IN_URI_10 2.811 2.492 2.811 2.492
+score URI_IN_URI_5 2.102 2.542 2.102 2.542
+score URI_ONLY_MSGID_MALF 1.999 1.081 1.999 1.081
score URI_OPTOUT_3LD 1.000 1.000 1.000 1.000
-score URI_PHISH 2.253 3.999 2.253 3.999
-score URI_PHP_REDIR 3.499 3.499 3.499 3.499
-score URI_TRY_3LD 1.938 1.999 1.938 1.999
-score URI_WPADMIN 2.700 2.399 2.700 2.399
-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_PHISH 2.250 3.999 2.250 3.999
+score URI_PHP_REDIR 3.499 3.496 3.499 3.496
+score URI_TRY_3LD 0.001 1.997 0.001 1.997
+score URI_WPADMIN 2.699 2.399 2.699 2.399
+score URI_WP_DIRINDEX 2.498 3.499 2.498 3.499
+score URI_WP_HACKED 2.980 3.499 2.980 3.499
+score URI_WP_HACKED_2 2.499 2.497 2.499 2.497
score USB_DRIVES 1.000 1.000 1.000 1.000
score 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 2.499 2.499 2.499 2.499
+score XPRIO_SHORT_SUBJ 2.500 1.428 2.500 1.428
diff --git a/rulesrc/scores/scores-set0 b/rulesrc/scores/scores-set0
index 3ea70e3..784e78a 100644
--- a/rulesrc/scores/scores-set0
+++ b/rulesrc/scores/scores-set0
@@ -1,180 +1,194 @@
-# Using score set 0 logs for revision 1881814 from:
-# ham-axb-coi-bulk.r1881814.log ham-axb-generic.r1881814.log ham-axb-ham-misc.r1881814.log ham-darxus.r1881814.log ham-ena-week0.r1881814.log ham-ena-week1.r1881814.log ham-ena-week2.r1881814.log ham-ena-week3.r1881814.log ham-ena-week4.r1881814.log ham-giovanni-ham.r1881814.log ham-giovanni-spammy.r1881814.log ham-giovanni-spam.r1881814.log ham-grenier.r1881814.log ham-jbrooks.r1881814.log ham-llanga.r1881814.log ham-mmiroslaw-mails-ham.r1881814.log ham-mmiroslaw-mails-spam.r1881814.log ham-npiazzi.r1881814.log ham-pds.r1881814.log ham-sihde.r1881814.log ham-spamsponge.r1881814.log ham-thendrikx.r1881814.log spam-axb-coi-bulk.r1881814.log spam-axb-generic.r1881814.log spam-axb-ham-misc.r1881814.log spam-darxus.r1881814.log spam-ena-week0.r1881814.log spam-ena-week1.r1881814.log spam-ena-week2.r1881814.log spam-ena-week3.r1881814.log spam-ena-week4.r1881814.log spam-giovanni-ham.r1881814.log spam-giovanni-spammy.r1881814.log spam-giovanni-spam.r1881814.log spam-grenier.r1881814.log spam-jbrooks.r1881814.log spam-llanga.r1881814.log spam-mmiroslaw-mails-ham.r1881814.log spam-mmiroslaw-mails-spam.r1881814.log spam-npiazzi.r1881814.log spam-pds.r1881814.log spam-sihde.r1881814.log spam-spamsponge.r1881814.log spam-thendrikx.r1881814.log
+# Using score set 0 logs for revision 1881867 from:
+# ham-axb-coi-bulk.r1881867.log ham-axb-generic.r1881867.log ham-axb-ham-misc.r1881867.log ham-darxus.r1881867.log ham-ena-week0.r1881867.log ham-ena-week1.r1881867.log ham-ena-week2.r1881867.log ham-ena-week3.r1881867.log ham-ena-week4.r1881867.log ham-giovanni-ham.r1881867.log ham-giovanni-spammy.r1881867.log ham-giovanni-spam.r1881867.log ham-grenier.r1881867.log ham-jbrooks.r1881867.log ham-mmiroslaw-mails-ham.r1881867.log ham-mmiroslaw-mails-spam.r1881867.log ham-npiazzi.r1881867.log ham-pds.r1881867.log ham-sihde.r1881867.log ham-spamsponge.r1881867.log ham-thendrikx.r1881867.log spam-axb-coi-bulk.r1881867.log spam-axb-generic.r1881867.log spam-axb-ham-misc.r1881867.log spam-darxus.r1881867.log spam-ena-week0.r1881867.log spam-ena-week1.r1881867.log spam-ena-week2.r1881867.log spam-ena-week3.r1881867.log spam-ena-week4.r1881867.log spam-giovanni-ham.r1881867.log spam-giovanni-spammy.r1881867.log spam-giovanni-spam.r1881867.log spam-grenier.r1881867.log spam-jbrooks.r1881867.log spam-mmiroslaw-mails-ham.r1881867.log spam-mmiroslaw-mails-spam.r1881867.log spam-npiazzi.r1881867.log spam-pds.r1881867.log spam-sihde.r1881867.log spam-spamsponge.r1881867.log spam-thendrikx.r1881867.log
score AC_BR_BONANZA 0.001
-score AC_DIV_BONANZA 0.001 # force non-zero
score AC_FROM_MANY_DOTS 2.999
-score AC_HTML_NONSENSE_TAGS 1.999
+score AC_HTML_NONSENSE_TAGS 2.000
score AC_POST_EXTRAS 2.499
-score ADMITS_SPAM 1.849
+score ADMITS_SPAM 1.960
score ADVANCE_FEE_2_NEW_MONEY 1.999
-score ADVANCE_FEE_3_NEW_MONEY 2.799
-score ADVANCE_FEE_4_NEW_MONEY 2.799
-score ADVANCE_FEE_5_NEW 1.897
-score AMAZON_IMG_NOT_RCVD_AMZN 2.500
-score AXB_XMAILER_MIMEOLE_OL_024C2 2.600
-score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 3.892
+score ADVANCE_FEE_3_NEW 0.001
+score ADVANCE_FEE_3_NEW_MONEY 0.001
+score ADVANCE_FEE_4_NEW_MONEY 2.699
+score ADVANCE_FEE_5_NEW 2.899
+score AMAZON_IMG_NOT_RCVD_AMZN 2.499
+score AXB_XMAILER_MIMEOLE_OL_024C2 2.498
+score BITCOIN_DEADLINE 2.952
+score BITCOIN_EXTORT_01 4.906
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_SPAM_02 0.974
-score BITCOIN_SPAM_04 1.500
-score BITCOIN_XPRIO 1.250
-score BITCOIN_YOUR_INFO 1.326
+score BITCOIN_SPAM_02 0.049
+score BITCOIN_SPAM_04 1.499
+score BITCOIN_SPAM_07 2.421
+score BITCOIN_XPRIO 0.001 # force non-zero
+score BITCOIN_YOUR_INFO 1.500
score BODY_URI_ONLY 0.999
-score BOGUS_MIME_VERSION 3.383
-score CK_HELO_DYNAMIC_SPLIT_IP 1.499
-score CK_HELO_GENERIC 0.249
-score CTE_8BIT_MISMATCH 1.000
-score CTYPE_NULL 2.603
+score BOGUS_MIME_VERSION 3.377
+score CK_HELO_DYNAMIC_SPLIT_IP 1.500
+score CK_HELO_GENERIC 0.250
+score COMPENSATION 1.499
+score CTE_8BIT_MISMATCH 0.999
+score CTYPE_NULL 2.117
score DOTGOV_IMAGE 2.999
score DSN_NO_MIMEVERSION 1.999
-score DX_TEXT_03 0.799
-score END_FUTURE_EMAILS 2.098
-score FILL_THIS_FORM 1.199
-score FONT_INVIS_DIRECT 1.438
-score FONT_INVIS_DOTGOV 1.112
-score FONT_INVIS_LONG_LINE 0.001
-score FONT_INVIS_MSGID 2.449
-score FONT_INVIS_POSTEXTRAS 0.001
-score FORGED_RELAY_MUA_TO_MX 4.099
+score DX_TEXT_03 0.400
+score END_FUTURE_EMAILS 1.848
+score FILL_THIS_FORM 0.001
+score FONT_INVIS_DIRECT 2.599
+score FONT_INVIS_DOTGOV 0.114
+score FONT_INVIS_LONG_LINE 0.117
+score FONT_INVIS_MSGID 2.285
+score FONT_INVIS_POSTEXTRAS 1.788
+score FORGED_RELAY_MUA_TO_MX 3.999
score FORM_FRAUD 0.999
-score FORM_FRAUD_5 2.218
+score FORM_FRAUD_3 2.400
+score FORM_FRAUD_5 2.999
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FREEMAIL_FORGED_FROMDOMAIN 0.249
score FROM_2_EMAILS_SHORT 1.999
score FROM_ADDR_WS 2.999
-score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 0.329
-score FROM_MISSP_EH_MATCH 1.999
-score FROM_MISSP_FREEMAIL 2.000
-score FROM_MISSP_MSFT 0.543
-score FROM_MISSP_REPLYTO 2.499
-score FROM_MISSP_TO_UNDISC 1.796
+score FROM_MISSPACED 0.001
+score FROM_MISSP_DYNIP 0.087
+score FROM_MISSP_EH_MATCH 0.001 # force non-zero
+score FROM_MISSP_FREEMAIL 2.999
+score FROM_MISSP_MSFT 0.001
+score FROM_MISSP_REPLYTO 0.001
+score FROM_MISSP_TO_UNDISC 2.167
score FROM_MISSP_USER 0.001
-score FROM_MISSP_XPRIO 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.301
+score FROM_MISSP_XPRIO 0.490
+score FROM_NAME_EQ_TO_G_DRIVE 1.499
+score FROM_NTLD_REPLY_FREEMAIL 1.699
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_UNBAL1 1.996
-score FROM_URI 1.531
-score FROM_WORDY 0.001
-score FROM_WWW 2.255
+score FROM_SUSPICIOUS_NTLD_FP 2.000
+score FROM_UNBAL1 1.999
+score FROM_URI 0.498
+score FROM_WORDY 1.899
+score FROM_WWW 1.040
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FSL_THIS_IS_ADV 2.752
-score GB_BITCOIN_CP 1.756
-score GB_FREEMAIL_DISPTO 0.499
+score FSL_THIS_IS_ADV 2.638
+score FUZZY_WALLET 2.399
+score GB_BITCOIN_CP 1.922
+score GB_FREEMAIL_DISPTO 0.001 # force non-zero
score GB_GOOGLE_OBFUS 0.749
score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 2.601
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
+score HDR_ORDER_FTSDMCXX_DIRECT 0.052
+score HDR_ORDER_FTSDMCXX_NORDNS 2.600
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_MISC_IP 0.249
score HELO_NO_DOMAIN 0.001
-score HK_RANDOM_FROM 0.978
-score HK_RANDOM_REPLYTO 0.999
-score HK_SCAM 1.566
+score HK_RANDOM_FROM 0.113
+score HK_RANDOM_REPLYTO 1.000
+score HK_RCVD_IP_MULTICAST 1.999
+score HK_SCAM 1.999
score HOSTED_IMG_DIRECT_MX 3.499
-score HTML_OFF_PAGE 0.102
-score HTML_SINGLET_MANY 0.247
-score HTML_TEXT_INVISIBLE_FONT 2.550
-score HTML_TEXT_INVISIBLE_STYLE 1.887
-score IMG_ONLY_FM_DOM_INFO 1.698
-score KB_FORGED_MOZ4 4.500
-score KHOP_FAKE_EBAY 0.187
+score HTML_OFF_PAGE 0.599
+score HTML_SINGLET_MANY 0.001
+score HTML_TEXT_INVISIBLE_FONT 1.750
+score HTML_TEXT_INVISIBLE_STYLE 0.001
+score IMG_ONLY_FM_DOM_INFO 0.001
+score KB_FORGED_MOZ4 4.263
+score KHOP_FAKE_EBAY 0.399
score KHOP_HELO_FCRDNS 0.399
-score LH_URI_DOM_IN_PATH 2.700
-score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.296
+score LH_URI_DOM_IN_PATH 2.499
+score LIST_PRTL_SAME_USER 0.507
+score LONG_HEX_URI 1.787
+score LONG_IMG_URI 1.404
+score LONG_INVISIBLE_TEXT 2.999
score LOTS_OF_MONEY 0.010
-score MANY_SPAN_IN_TEXT 3.099
-score MAY_BE_FORGED 2.699
-score MILLION_HUNDRED 0.001
+score MANY_SPAN_IN_TEXT 2.800
+score MAY_BE_FORGED 1.788
+score MILLION_HUNDRED 0.175
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 0.001
score MIXED_ES 2.699
-score MONEY_FORM_SHORT 1.698
-score MONEY_FRAUD_3 2.599
-score MONEY_FRAUD_5 2.599
-score MONEY_FRAUD_8 1.959
+score MONEY_FORM_SHORT 1.683
+score MONEY_FRAUD_3 2.499
+score MONEY_FRAUD_5 2.899
+score MONEY_FRAUD_8 0.001 # force non-zero
score MONEY_FROM_MISSP 1.999
score MSM_PRIO_REPTO 2.499
-score NICE_REPLY_A -0.299
-score NORDNS_LOW_CONTRAST 1.886
+score NICE_REPLY_A -0.001
+score NORDNS_LOW_CONTRAST 1.783
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 0.830
-score OFFER_ONLY_AMERICA 2.000
-score PDS_BTC_ID 0.500
+score NSL_RCVD_HELO_USER 0.553
+score OFFER_ONLY_AMERICA 0.106
+score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.001
-score PDS_EMPTYSUBJ_URISHRT 1.499
+score PDS_EMPTYSUBJ_URISHRT 1.100
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 2.099
+score PDS_FROM_2_EMAILS 1.699
score PDS_FROM_NAME_TO_DOMAIN 0.999
score PDS_NAKED_TO_NUMERO 1.999
score PDS_SHORTFWD_URISHRT 1.499
-score PDS_TINYSUBJ_URISHRT 1.499
+score PDS_TINYSUBJ_URISHRT 1.500
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PDS_TO_EQ_FROM_NAME 0.001
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000
+score PDS_TO_EQ_FROM_NAME 3.379
score PHP_ORIG_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RATWARE_NO_RDNS 1.008
-score RISK_FREE 2.999
-score SENDGRID_REDIR 1.999
-score SENDGRID_REDIR_PHISH 3.499
-score SERGIO_SUBJECT_VIAGRA01 2.617
+score RATWARE_NO_RDNS 1.722
+score RCVD_DOTEDU_SHORT 2.499
+score RCVD_DOTEDU_SUSP_URI 0.304
+score RDNS_NUM_TLD_XM 2.999
+score RISK_FREE 2.899
+score SENDGRID_REDIR 1.499
+score SENDGRID_REDIR_PHISH 3.467
+score SERGIO_SUBJECT_VIAGRA01 3.299
score SHORTENED_URL_SRC 2.999
score SHORTENER_SHORT_IMG 0.001
-score SHORT_BODY_G_DRIVE_DYN 1.046
-score SHORT_SHORTNER 2.000
-score SHORT_URL 2.298
-score SINGLETS_LOW_CONTRAST 0.001
+score SHORT_BODY_G_DRIVE_DYN 1.480
+score SHORT_SHORTNER 1.999
+score SHORT_URL 1.768
+score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 1.499
score STATIC_XPRIO_OLE 1.999
-score STOCK_LOW_CONTRAST 2.500
-score STOX_BOUND_090909_B 1.936
-score SUBJ_OBFU_PUNCT_FEW 0.001
+score STOCK_LOW_CONTRAST 2.499
+score STOX_BOUND_090909_B 1.979
+score SUBJ_OBFU_PUNCT_FEW 0.026
score SUBJ_OBFU_PUNCT_MANY 1.749
score SUSP_UTF8_WORD_COMBO 0.001
-score SUSP_UTF8_WORD_FROM 0.450
-score SUSP_UTF8_WORD_SUBJ 1.999
-score THIS_AD 1.299
+score SUSP_UTF8_WORD_FROM 0.644
+score SUSP_UTF8_WORD_SUBJ 2.000
+score THIS_AD 0.099
score THIS_IS_ADV_SUSP_NTLD 0.001
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
-score TO_EQ_FM_DOM_HTML_IMG 0.200
-score TO_EQ_FM_DOM_HTML_ONLY 0.890
-score TO_EQ_FM_HTML_ONLY 0.796
+score TO_EQ_FM_DOM_HTML_IMG 0.001
+score TO_EQ_FM_DOM_HTML_ONLY 0.937
+score TO_EQ_FM_HTML_ONLY 0.337
score TO_IN_SUBJ 0.099
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score TO_NO_BRKTS_FROM_MSSP 1.874
+score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 2.500
-score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TVD_RCVD_SPACE_BRACKET 4.299
-score TVD_SPACE_ENCODED 1.103
-score TVD_SPACE_RATIO_MINFP 1.620
-score UPGRADE_MAILBOX 1.087
-score URI_DOTEDU 2.000
-score URI_DOTEDU_ENTITY 2.919
-score URI_DOTEDU_LONG 2.286
-score URI_GOOGLE_PROXY 0.839
-score URI_IMG_WP_REDIR 2.999
-score URI_IN_URI_10 2.203
-score URI_IN_URI_5 2.440
+score TO_NO_BRKTS_MSFT 2.499
+score TO_NO_BRKTS_NORDNS_HTML 0.253
+score TO_NO_BRKTS_PCNT 2.499
+score TVD_RCVD_SPACE_BRACKET 4.500
+score TVD_SPACE_ENCODED 2.499
+score TVD_SPACE_RATIO_MINFP 0.061
+score UNICODE_OBFU_ASC 2.499
+score UPGRADE_MAILBOX 0.094
+score URI_DOTEDU 1.999
+score URI_DOTEDU_ENTITY 2.999
+score URI_DOTEDU_LONG 0.001
+score URI_GOOGLE_PROXY 0.104
+score URI_IMG_WP_REDIR 2.813
+score URI_IN_URI_10 2.811
+score URI_IN_URI_5 2.102
score URI_ONLY_MSGID_MALF 1.999
-score URI_PHISH 2.253
+score URI_PHISH 2.250
score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.938
-score URI_WPADMIN 2.700
-score URI_WP_DIRINDEX 3.499
-score URI_WP_HACKED 3.499
+score URI_TRY_3LD 0.001
+score URI_WPADMIN 2.699
+score URI_WP_DIRINDEX 2.498
+score URI_WP_HACKED 2.980
score URI_WP_HACKED_2 2.499
score XPRIO 2.249
-score XPRIO_SHORT_SUBJ 2.499
+score XPRIO_SHORT_SUBJ 2.500
+score AC_DIV_BONANZA 0.001
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
@@ -185,7 +199,6 @@
score AC_SPAMMY_URI_PATTERNS8 1.000
score AC_SPAMMY_URI_PATTERNS9 1.000
score ADVANCE_FEE_2_NEW_FORM 1.000
-score ADVANCE_FEE_3_NEW 1.000
score AD_PREFS 0.250
score ALIBABA_IMG_NOT_RCVD_ALI 1.000
score APP_DEVELOPMENT_FREEM 1.000
@@ -197,7 +210,6 @@
score BITCOIN_SPAM_01 1.000
score BITCOIN_SPAM_03 1.000
score BITCOIN_SPAM_06 1.000
-score BITCOIN_SPAM_07 1.000
score BITCOIN_SPAM_08 1.000
score BITCOIN_SPAM_09 1.000
score BITCOIN_SPAM_10 1.000
@@ -211,7 +223,6 @@
score BULK_RE_SUSP_NTLD 1.000
score CANT_SEE_AD 1.000
score COMMENT_GIBBERISH 1.000
-score COMPENSATION 1.000
score DAY_I_EARNED 1.000
score EBAY_IMG_NOT_RCVD_EBAY 1.000
score ENCRYPTED_MESSAGE -1.000
@@ -236,7 +247,6 @@
score HDRS_MISSP 1.000
score HEXHASH_WORD 1.000
score HK_CTE_RAW 1.000
-score HK_RCVD_IP_MULTICAST 1.000
score HOSTED_IMG_DQ_UNSUB 1.000
score HOSTED_IMG_FREEM 1.000
score HOSTED_IMG_MULTI 1.000
@@ -245,7 +255,6 @@
score HTML_SHRT_CMNT_OBFU_MANY 1.000
score LIST_PARTIAL_SHORT_MSG 1.000
score LIST_PRTL_PUMPDUMP 1.000
-score LONG_IMG_URI 1.000
score LUCRATIVE 1.000
score MALF_HTML_B64 1.000
score MALWARE_NORDNS 1.000
@@ -265,10 +274,7 @@
score PUMPDUMP 1.000
score PUMPDUMP_MULTI 1.000
score RAND_HEADER_MANY 1.000
-score RCVD_DOTEDU_SHORT 1.000
-score RCVD_DOTEDU_SUSP_URI 1.000
score RDNS_NUM_TLD_ATCHNX 1.000
-score RDNS_NUM_TLD_XM 1.000
score SEO_SUSP_NTLD 1.000
score SHOPIFY_IMG_NOT_RCVD_SFY 1.000
score SHORT_IMG_SUSP_NTLD 1.000
@@ -276,11 +282,8 @@
score SYSADMIN 1.000
score TO_EQ_FM_DIRECT_MX 1.000
score TO_NAME_SUBJ_NO_RDNS 1.000
-score TO_NO_BRKTS_HTML_IMG 1.000
-score TO_NO_BRKTS_PCNT 1.000
score TW_GIBBERISH_MANY 1.000
score UC_GIBBERISH_OBFU 1.000
-score UNICODE_OBFU_ASC 1.000
score UNICODE_OBFU_ZW 1.000
score URI_DATA 1.000
score URI_HEX_IP 1.000
diff --git a/rulesrc/scores/scores-set1 b/rulesrc/scores/scores-set1
index a0cb9e8..a1151c9 100644
--- a/rulesrc/scores/scores-set1
+++ b/rulesrc/scores/scores-set1
@@ -2,204 +2,204 @@
# ham-net-axb-coi-bulk.r1881840.log ham-net-axb-generic.r1881840.log ham-net-axb-ham-misc.r1881840.log ham-net-darxus.r1881840.log ham-net-ena-week0.r1881840.log ham-net-ena-week1.r1881840.log ham-net-ena-week2.r1881840.log ham-net-ena-week3.r1881840.log ham-net-ena-week4.r1881840.log ham-net-giovanni-ham.r1881840.log ham-net-giovanni-spammy.r1881840.log ham-net-giovanni-spam.r1881840.log ham-net-grenier.r1881840.log ham-net-jbrooks.r1881840.log ham-net-mmiroslaw-mails-ham.r1881840.log ham-net-mmiroslaw-mails-spam.r1881840.log ham-net-npiazzi.r1881840.log ham-net-pds.r1881840.log ham-net-sihde.r1881840.log ham-net-spamsponge.r1881840.log ham-net-thendrikx.r1881840.log spam-net-axb-coi-bulk.r1881840.log spam-net-axb-generic.r1881840.log spam-net-axb-ham-misc.r1881840.log spam-net-darxus.r1881840.log spam-net-ena-week0.r1881840.log spam-net-ena-week1.r1881840.log spam-net-ena-week2.r1881840.log spam-net-ena-week3.r1881840.log spam-net-ena-week4.r1881840.log spam-net-giovanni-ham.r1881840.log spam-net-giovanni-spammy.r1881840.log spam-net-giovanni-spam.r1881840.log spam-net-grenier.r1881840.log spam-net-jbrooks.r1881840.log spam-net-mmiroslaw-mails-ham.r1881840.log spam-net-mmiroslaw-mails-spam.r1881840.log spam-net-npiazzi.r1881840.log spam-net-pds.r1881840.log spam-net-sihde.r1881840.log spam-net-spamsponge.r1881840.log spam-net-thendrikx.r1881840.log
score AC_BR_BONANZA 0.001
-score AC_DIV_BONANZA 0.001 # force non-zero
-score AC_FROM_MANY_DOTS 1.285
+score AC_DIV_BONANZA 0.001
+score AC_FROM_MANY_DOTS 0.866
score AC_HTML_NONSENSE_TAGS 1.999
score AC_POST_EXTRAS 0.001
score ADMITS_SPAM 0.001
score ADVANCE_FEE_2_NEW_MONEY 1.999
score ADVANCE_FEE_3_NEW 3.499
-score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 1.971
+score ADVANCE_FEE_3_NEW_MONEY 0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY 1.146
score ADVANCE_FEE_5_NEW 2.699
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.061
-score BITCOIN_DEADLINE 2.612
-score BITCOIN_EXTORT_01 4.059
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
+score BITCOIN_DEADLINE 2.760
+score BITCOIN_EXTORT_01 4.357
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_SPAM_02 1.523
-score BITCOIN_SPAM_04 1.499
-score BITCOIN_SPAM_05 1.093
-score BITCOIN_SPAM_07 3.440
-score BITCOIN_XPRIO 1.269
-score BITCOIN_YOUR_INFO 0.615
+score BITCOIN_SPAM_02 2.100
+score BITCOIN_SPAM_04 1.498
+score BITCOIN_SPAM_05 2.455
+score BITCOIN_SPAM_07 3.499
+score BITCOIN_XPRIO 1.258
+score BITCOIN_YOUR_INFO 0.462
score BODY_URI_ONLY 0.001
-score BOGUS_MIME_VERSION 2.296
-score CK_HELO_DYNAMIC_SPLIT_IP 1.499
-score CK_HELO_GENERIC 0.250
-score CTE_8BIT_MISMATCH 1.000
-score CTYPE_NULL 2.399
+score BOGUS_MIME_VERSION 3.499
+score CK_HELO_DYNAMIC_SPLIT_IP 1.498
+score CK_HELO_GENERIC 0.249
+score CTE_8BIT_MISMATCH 0.999
+score CTYPE_NULL 2.499
score DKIMWL_BL 2.999
-score DKIMWL_WL_HIGH -1.501
+score DKIMWL_WL_HIGH -1.455
score DKIMWL_WL_MED -0.001
score DOTGOV_IMAGE 2.999
score DSN_NO_MIMEVERSION 1.999
score DX_TEXT_03 0.299
-score END_FUTURE_EMAILS 1.050
+score END_FUTURE_EMAILS 1.039
score FILL_THIS_FORM 0.001
-score FONT_INVIS_DIRECT 0.001
-score FONT_INVIS_DOTGOV 0.001 # force non-zero
-score FONT_INVIS_LONG_LINE 1.567
+score FONT_INVIS_DIRECT 0.001 # force non-zero
+score FONT_INVIS_DOTGOV 0.001
+score FONT_INVIS_LONG_LINE 1.564
score FONT_INVIS_MSGID 0.001
-score FONT_INVIS_POSTEXTRAS 0.001
-score FORGED_RELAY_MUA_TO_MX 3.715
-score FORGED_SPF_HELO 1.499
-score FORM_FRAUD 0.999
+score FONT_INVIS_POSTEXTRAS 2.411
+score FORGED_RELAY_MUA_TO_MX 3.670
+score FORGED_SPF_HELO 1.498
+score FORM_FRAUD 0.998
score FORM_FRAUD_5 2.699
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FREEMAIL_FORGED_FROMDOMAIN 0.248
score FROM_2_EMAILS_SHORT 1.999
-score FROM_ADDR_WS 2.854
+score FROM_ADDR_WS 2.745
score FROM_FMBLA_NEWDOM 1.499
-score FROM_FMBLA_NEWDOM14 0.999
+score FROM_FMBLA_NEWDOM14 0.998
score FROM_FMBLA_NEWDOM28 0.649
-score FROM_GOV_DKIM_AU -1.000
+score FROM_GOV_DKIM_AU -0.998
score FROM_GOV_SPOOF 0.999
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.513
+score FROM_MISSP_DYNIP 2.599
score FROM_MISSP_EH_MATCH 0.001
-score FROM_MISSP_FREEMAIL 0.143
+score FROM_MISSP_FREEMAIL 2.347
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_REPLYTO 0.001
score FROM_MISSP_SPF_FAIL 1.999
-score FROM_MISSP_TO_UNDISC 0.001
+score FROM_MISSP_TO_UNDISC 1.229
score FROM_MISSP_USER 0.001
-score FROM_MISSP_XPRIO 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.906
+score FROM_MISSP_XPRIO 0.001 # force non-zero
+score FROM_NAME_EQ_TO_G_DRIVE 1.430
+score FROM_NTLD_REPLY_FREEMAIL 1.999
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_UNBAL1 2.344
-score FROM_URI 2.306
-score FROM_WORDY 2.081
-score FROM_WWW 2.442
+score FROM_SUSPICIOUS_NTLD_FP 1.997
+score FROM_UNBAL1 2.406
+score FROM_URI 1.346
+score FROM_WORDY 2.499
+score FROM_WWW 2.399
score FSL_BULK_SIG 0.001 # force non-zero
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FSL_THIS_IS_ADV 0.447
+score FSL_THIS_IS_ADV 0.001
score FUZZY_WALLET 2.199
-score GB_BITCOIN_CP 1.767
-score GB_FREEMAIL_DISPTO 0.001 # force non-zero
+score GB_BITCOIN_CP 0.403
+score GB_FREEMAIL_DISPTO 0.001
score GB_GOOGLE_OBFUS 0.749
score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
-score HDR_ORDER_FTSDMCXX_DIRECT 0.812
+score HDR_ORDER_FTSDMCXX_DIRECT 0.811
score HDR_ORDER_FTSDMCXX_NORDNS 2.898
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
-score HELO_MISC_IP 0.094
-score HELO_NO_DOMAIN 0.001 # force non-zero
+score HELO_MISC_IP 0.053
+score HELO_NO_DOMAIN 0.001
score HK_RANDOM_FROM 0.001
-score HK_RANDOM_REPLYTO 0.999
+score HK_RANDOM_REPLYTO 0.998
score HK_SCAM 0.001
-score HOSTED_IMG_DIRECT_MX 1.750
-score HTML_OFF_PAGE 0.001 # force non-zero
-score HTML_SINGLET_MANY 0.001 # force non-zero
-score HTML_TEXT_INVISIBLE_FONT 2.013
-score HTML_TEXT_INVISIBLE_STYLE 1.783
-score IMG_ONLY_FM_DOM_INFO 2.426
+score HOSTED_IMG_DIRECT_MX 1.558
+score HTML_OFF_PAGE 0.001
+score HTML_SINGLET_MANY 0.001
+score HTML_TEXT_INVISIBLE_FONT 2.003
+score HTML_TEXT_INVISIBLE_STYLE 2.533
+score IMG_ONLY_FM_DOM_INFO 2.442
score KB_FORGED_MOZ4 4.499
-score KHOP_FAKE_EBAY 0.899
-score KHOP_HELO_FCRDNS 0.400
+score KHOP_FAKE_EBAY 0.119
+score KHOP_HELO_FCRDNS 0.399
score LH_URI_DOM_IN_PATH 0.001
-score LIST_PRTL_SAME_USER 1.818
-score LONG_HEX_URI 0.001 # force non-zero
-score LONG_IMG_URI 0.001 # force non-zero
-score LONG_INVISIBLE_TEXT 1.850
+score LIST_PRTL_SAME_USER 0.791
+score LONG_HEX_URI 0.001
+score LONG_IMG_URI 0.001
+score LONG_INVISIBLE_TEXT 1.848
score LOTS_OF_MONEY 0.010
score MANY_SPAN_IN_TEXT 1.435
score MILLION_HUNDRED 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 0.001
-score MIXED_ES 2.499
+score MIXED_ES 2.497
score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 1.916
-score MONEY_FRAUD_5 0.710
+score MONEY_FRAUD_3 1.907
+score MONEY_FRAUD_5 1.534
score MONEY_FRAUD_8 0.001
-score MONEY_FROM_MISSP 1.236
+score MONEY_FROM_MISSP 0.001
score MSM_PRIO_REPTO 2.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 0.912
+score NORDNS_LOW_CONTRAST 0.910
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 0.650
+score NSL_RCVD_HELO_USER 0.174
score PDS_BTC_ID 0.499
-score PDS_BTC_MSGID 0.001
+score PDS_BTC_MSGID 0.011
score PDS_EMPTYSUBJ_URISHRT 0.001
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
score PDS_FROM_2_EMAILS 1.499
-score PDS_FROM_NAME_TO_DOMAIN 0.999
+score PDS_FROM_NAME_TO_DOMAIN 1.000
score PDS_NAKED_TO_NUMERO 1.999
score PDS_SHORTFWD_URISHRT 1.499
-score PDS_TINYSUBJ_URISHRT 0.567
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.397
+score PDS_TINYSUBJ_URISHRT 0.592
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.972
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
score PDS_TO_EQ_FROM_NAME 3.399
score PHP_ORIG_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.001
-score RATWARE_NO_RDNS 0.977
-score RCVD_DOTEDU_SHORT 2.490
-score RCVD_DOTEDU_SUSP_URI 0.001 # force non-zero
+score RATWARE_NO_RDNS 1.627
+score RCVD_DOTEDU_SHORT 2.401
+score RCVD_DOTEDU_SUSP_URI 0.001
score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_XM 1.321
-score RISK_FREE 2.599
-score SENDGRID_REDIR 1.499
-score SENDGRID_REDIR_PHISH 3.499
+score RDNS_NUM_TLD_XM 0.352
+score RISK_FREE 2.699
+score SENDGRID_REDIR 1.498
+score SENDGRID_REDIR_PHISH 3.393
score SERGIO_SUBJECT_VIAGRA01 3.599
score SHORTENED_URL_SRC 2.699
-score SHORTENER_SHORT_IMG 0.714
-score SHORT_BODY_G_DRIVE_DYN 0.823
-score SHORT_SHORTNER 1.999
-score SHORT_URL 0.047
-score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
-score SPOOFED_FREEMAIL 1.652
-score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 1.042
-score SPOOFED_FREEM_REPTO_CHN 1.296
+score SHORTENER_SHORT_IMG 1.728
+score SHORT_BODY_G_DRIVE_DYN 0.001
+score SHORT_SHORTNER 1.997
+score SHORT_URL 0.440
+score SINGLETS_LOW_CONTRAST 0.001
+score SPOOFED_FREEMAIL 1.997
+score SPOOFED_FREEMAIL_NO_RDNS 0.001 # force non-zero
+score SPOOFED_FREEM_REPTO 0.694
+score SPOOFED_FREEM_REPTO_CHN 0.660
score STATIC_XPRIO_OLE 1.999
-score STOCK_LOW_CONTRAST 0.055
-score STOX_BOUND_090909_B 2.399
-score SUBJ_OBFU_PUNCT_FEW 0.009
+score STOCK_LOW_CONTRAST 0.001
+score STOX_BOUND_090909_B 2.299
+score SUBJ_OBFU_PUNCT_FEW 0.008
score SUBJ_OBFU_PUNCT_MANY 0.001
score SUSP_UTF8_WORD_COMBO 2.999
score SUSP_UTF8_WORD_FROM 1.999
score SUSP_UTF8_WORD_SUBJ 1.999
score THIS_AD 0.899
score THIS_IS_ADV_SUSP_NTLD 0.001
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 0.505
-score TO_EQ_FM_DOM_HTML_IMG 0.001
-score TO_EQ_FM_DOM_HTML_ONLY 1.071
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 0.558
+score TO_EQ_FM_DOM_HTML_IMG 0.600
+score TO_EQ_FM_DOM_HTML_ONLY 1.899
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_ONLY 0.733
+score TO_EQ_FM_HTML_ONLY 0.332
score TO_EQ_FM_SPF_FAIL 0.001
score TO_IN_SUBJ 0.099
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score TO_NO_BRKTS_FROM_MSSP 2.097
score TO_NO_BRKTS_HTML_IMG 1.787
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 0.407
-score TO_NO_BRKTS_NORDNS_HTML 1.999
+score TO_NO_BRKTS_MSFT 0.001
+score TO_NO_BRKTS_NORDNS_HTML 1.997
score TVD_RCVD_SPACE_BRACKET 4.499
-score TVD_SPACE_ENCODED 2.195
+score TVD_SPACE_ENCODED 1.779
score TVD_SPACE_RATIO_MINFP 0.001
-score UNICODE_OBFU_ASC 2.500
-score UPGRADE_MAILBOX 0.972
+score UNICODE_OBFU_ASC 2.499
+score UPGRADE_MAILBOX 0.274
score URI_DOTEDU 0.001
score URI_DOTEDU_ENTITY 2.999
-score URI_DOTEDU_LONG 0.001
-score URI_GOOGLE_PROXY 0.133
+score URI_DOTEDU_LONG 0.001 # force non-zero
+score URI_GOOGLE_PROXY 0.132
score URI_IMG_WP_REDIR 2.999
-score URI_IN_URI_10 3.693
-score URI_IN_URI_5 2.548
-score URI_ONLY_MSGID_MALF 1.813
+score URI_IN_URI_10 2.492
+score URI_IN_URI_5 2.542
+score URI_ONLY_MSGID_MALF 1.081
score URI_PHISH 3.999
-score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.999
+score URI_PHP_REDIR 3.496
+score URI_TRY_3LD 1.997
score URI_WPADMIN 2.399
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 2.499
-score XPRIO_SHORT_SUBJ 2.499
+score URI_WP_HACKED_2 2.497
+score XPRIO_SHORT_SUBJ 1.428
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
diff --git a/rulesrc/scores/scores-set2 b/rulesrc/scores/scores-set2
index 3ea70e3..784e78a 100644
--- a/rulesrc/scores/scores-set2
+++ b/rulesrc/scores/scores-set2
@@ -1,180 +1,194 @@
-# Using score set 0 logs for revision 1881814 from:
-# ham-axb-coi-bulk.r1881814.log ham-axb-generic.r1881814.log ham-axb-ham-misc.r1881814.log ham-darxus.r1881814.log ham-ena-week0.r1881814.log ham-ena-week1.r1881814.log ham-ena-week2.r1881814.log ham-ena-week3.r1881814.log ham-ena-week4.r1881814.log ham-giovanni-ham.r1881814.log ham-giovanni-spammy.r1881814.log ham-giovanni-spam.r1881814.log ham-grenier.r1881814.log ham-jbrooks.r1881814.log ham-llanga.r1881814.log ham-mmiroslaw-mails-ham.r1881814.log ham-mmiroslaw-mails-spam.r1881814.log ham-npiazzi.r1881814.log ham-pds.r1881814.log ham-sihde.r1881814.log ham-spamsponge.r1881814.log ham-thendrikx.r1881814.log spam-axb-coi-bulk.r1881814.log spam-axb-generic.r1881814.log spam-axb-ham-misc.r1881814.log spam-darxus.r1881814.log spam-ena-week0.r1881814.log spam-ena-week1.r1881814.log spam-ena-week2.r1881814.log spam-ena-week3.r1881814.log spam-ena-week4.r1881814.log spam-giovanni-ham.r1881814.log spam-giovanni-spammy.r1881814.log spam-giovanni-spam.r1881814.log spam-grenier.r1881814.log spam-jbrooks.r1881814.log spam-llanga.r1881814.log spam-mmiroslaw-mails-ham.r1881814.log spam-mmiroslaw-mails-spam.r1881814.log spam-npiazzi.r1881814.log spam-pds.r1881814.log spam-sihde.r1881814.log spam-spamsponge.r1881814.log spam-thendrikx.r1881814.log
+# Using score set 0 logs for revision 1881867 from:
+# ham-axb-coi-bulk.r1881867.log ham-axb-generic.r1881867.log ham-axb-ham-misc.r1881867.log ham-darxus.r1881867.log ham-ena-week0.r1881867.log ham-ena-week1.r1881867.log ham-ena-week2.r1881867.log ham-ena-week3.r1881867.log ham-ena-week4.r1881867.log ham-giovanni-ham.r1881867.log ham-giovanni-spammy.r1881867.log ham-giovanni-spam.r1881867.log ham-grenier.r1881867.log ham-jbrooks.r1881867.log ham-mmiroslaw-mails-ham.r1881867.log ham-mmiroslaw-mails-spam.r1881867.log ham-npiazzi.r1881867.log ham-pds.r1881867.log ham-sihde.r1881867.log ham-spamsponge.r1881867.log ham-thendrikx.r1881867.log spam-axb-coi-bulk.r1881867.log spam-axb-generic.r1881867.log spam-axb-ham-misc.r1881867.log spam-darxus.r1881867.log spam-ena-week0.r1881867.log spam-ena-week1.r1881867.log spam-ena-week2.r1881867.log spam-ena-week3.r1881867.log spam-ena-week4.r1881867.log spam-giovanni-ham.r1881867.log spam-giovanni-spammy.r1881867.log spam-giovanni-spam.r1881867.log spam-grenier.r1881867.log spam-jbrooks.r1881867.log spam-mmiroslaw-mails-ham.r1881867.log spam-mmiroslaw-mails-spam.r1881867.log spam-npiazzi.r1881867.log spam-pds.r1881867.log spam-sihde.r1881867.log spam-spamsponge.r1881867.log spam-thendrikx.r1881867.log
score AC_BR_BONANZA 0.001
-score AC_DIV_BONANZA 0.001 # force non-zero
score AC_FROM_MANY_DOTS 2.999
-score AC_HTML_NONSENSE_TAGS 1.999
+score AC_HTML_NONSENSE_TAGS 2.000
score AC_POST_EXTRAS 2.499
-score ADMITS_SPAM 1.849
+score ADMITS_SPAM 1.960
score ADVANCE_FEE_2_NEW_MONEY 1.999
-score ADVANCE_FEE_3_NEW_MONEY 2.799
-score ADVANCE_FEE_4_NEW_MONEY 2.799
-score ADVANCE_FEE_5_NEW 1.897
-score AMAZON_IMG_NOT_RCVD_AMZN 2.500
-score AXB_XMAILER_MIMEOLE_OL_024C2 2.600
-score BITCOIN_DEADLINE 2.999
-score BITCOIN_EXTORT_01 3.892
+score ADVANCE_FEE_3_NEW 0.001
+score ADVANCE_FEE_3_NEW_MONEY 0.001
+score ADVANCE_FEE_4_NEW_MONEY 2.699
+score ADVANCE_FEE_5_NEW 2.899
+score AMAZON_IMG_NOT_RCVD_AMZN 2.499
+score AXB_XMAILER_MIMEOLE_OL_024C2 2.498
+score BITCOIN_DEADLINE 2.952
+score BITCOIN_EXTORT_01 4.906
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_SPAM_02 0.974
-score BITCOIN_SPAM_04 1.500
-score BITCOIN_XPRIO 1.250
-score BITCOIN_YOUR_INFO 1.326
+score BITCOIN_SPAM_02 0.049
+score BITCOIN_SPAM_04 1.499
+score BITCOIN_SPAM_07 2.421
+score BITCOIN_XPRIO 0.001 # force non-zero
+score BITCOIN_YOUR_INFO 1.500
score BODY_URI_ONLY 0.999
-score BOGUS_MIME_VERSION 3.383
-score CK_HELO_DYNAMIC_SPLIT_IP 1.499
-score CK_HELO_GENERIC 0.249
-score CTE_8BIT_MISMATCH 1.000
-score CTYPE_NULL 2.603
+score BOGUS_MIME_VERSION 3.377
+score CK_HELO_DYNAMIC_SPLIT_IP 1.500
+score CK_HELO_GENERIC 0.250
+score COMPENSATION 1.499
+score CTE_8BIT_MISMATCH 0.999
+score CTYPE_NULL 2.117
score DOTGOV_IMAGE 2.999
score DSN_NO_MIMEVERSION 1.999
-score DX_TEXT_03 0.799
-score END_FUTURE_EMAILS 2.098
-score FILL_THIS_FORM 1.199
-score FONT_INVIS_DIRECT 1.438
-score FONT_INVIS_DOTGOV 1.112
-score FONT_INVIS_LONG_LINE 0.001
-score FONT_INVIS_MSGID 2.449
-score FONT_INVIS_POSTEXTRAS 0.001
-score FORGED_RELAY_MUA_TO_MX 4.099
+score DX_TEXT_03 0.400
+score END_FUTURE_EMAILS 1.848
+score FILL_THIS_FORM 0.001
+score FONT_INVIS_DIRECT 2.599
+score FONT_INVIS_DOTGOV 0.114
+score FONT_INVIS_LONG_LINE 0.117
+score FONT_INVIS_MSGID 2.285
+score FONT_INVIS_POSTEXTRAS 1.788
+score FORGED_RELAY_MUA_TO_MX 3.999
score FORM_FRAUD 0.999
-score FORM_FRAUD_5 2.218
+score FORM_FRAUD_3 2.400
+score FORM_FRAUD_5 2.999
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FREEMAIL_FORGED_FROMDOMAIN 0.249
score FROM_2_EMAILS_SHORT 1.999
score FROM_ADDR_WS 2.999
-score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 0.329
-score FROM_MISSP_EH_MATCH 1.999
-score FROM_MISSP_FREEMAIL 2.000
-score FROM_MISSP_MSFT 0.543
-score FROM_MISSP_REPLYTO 2.499
-score FROM_MISSP_TO_UNDISC 1.796
+score FROM_MISSPACED 0.001
+score FROM_MISSP_DYNIP 0.087
+score FROM_MISSP_EH_MATCH 0.001 # force non-zero
+score FROM_MISSP_FREEMAIL 2.999
+score FROM_MISSP_MSFT 0.001
+score FROM_MISSP_REPLYTO 0.001
+score FROM_MISSP_TO_UNDISC 2.167
score FROM_MISSP_USER 0.001
-score FROM_MISSP_XPRIO 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.301
+score FROM_MISSP_XPRIO 0.490
+score FROM_NAME_EQ_TO_G_DRIVE 1.499
+score FROM_NTLD_REPLY_FREEMAIL 1.699
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_UNBAL1 1.996
-score FROM_URI 1.531
-score FROM_WORDY 0.001
-score FROM_WWW 2.255
+score FROM_SUSPICIOUS_NTLD_FP 2.000
+score FROM_UNBAL1 1.999
+score FROM_URI 0.498
+score FROM_WORDY 1.899
+score FROM_WWW 1.040
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FSL_THIS_IS_ADV 2.752
-score GB_BITCOIN_CP 1.756
-score GB_FREEMAIL_DISPTO 0.499
+score FSL_THIS_IS_ADV 2.638
+score FUZZY_WALLET 2.399
+score GB_BITCOIN_CP 1.922
+score GB_FREEMAIL_DISPTO 0.001 # force non-zero
score GB_GOOGLE_OBFUS 0.749
score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 2.601
-score HEADER_FROM_DIFFERENT_DOMAINS 0.250
+score HDR_ORDER_FTSDMCXX_DIRECT 0.052
+score HDR_ORDER_FTSDMCXX_NORDNS 2.600
+score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_MISC_IP 0.249
score HELO_NO_DOMAIN 0.001
-score HK_RANDOM_FROM 0.978
-score HK_RANDOM_REPLYTO 0.999
-score HK_SCAM 1.566
+score HK_RANDOM_FROM 0.113
+score HK_RANDOM_REPLYTO 1.000
+score HK_RCVD_IP_MULTICAST 1.999
+score HK_SCAM 1.999
score HOSTED_IMG_DIRECT_MX 3.499
-score HTML_OFF_PAGE 0.102
-score HTML_SINGLET_MANY 0.247
-score HTML_TEXT_INVISIBLE_FONT 2.550
-score HTML_TEXT_INVISIBLE_STYLE 1.887
-score IMG_ONLY_FM_DOM_INFO 1.698
-score KB_FORGED_MOZ4 4.500
-score KHOP_FAKE_EBAY 0.187
+score HTML_OFF_PAGE 0.599
+score HTML_SINGLET_MANY 0.001
+score HTML_TEXT_INVISIBLE_FONT 1.750
+score HTML_TEXT_INVISIBLE_STYLE 0.001
+score IMG_ONLY_FM_DOM_INFO 0.001
+score KB_FORGED_MOZ4 4.263
+score KHOP_FAKE_EBAY 0.399
score KHOP_HELO_FCRDNS 0.399
-score LH_URI_DOM_IN_PATH 2.700
-score LIST_PRTL_SAME_USER 0.001
-score LONG_HEX_URI 2.296
+score LH_URI_DOM_IN_PATH 2.499
+score LIST_PRTL_SAME_USER 0.507
+score LONG_HEX_URI 1.787
+score LONG_IMG_URI 1.404
+score LONG_INVISIBLE_TEXT 2.999
score LOTS_OF_MONEY 0.010
-score MANY_SPAN_IN_TEXT 3.099
-score MAY_BE_FORGED 2.699
-score MILLION_HUNDRED 0.001
+score MANY_SPAN_IN_TEXT 2.800
+score MAY_BE_FORGED 1.788
+score MILLION_HUNDRED 0.175
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 0.001
score MIXED_ES 2.699
-score MONEY_FORM_SHORT 1.698
-score MONEY_FRAUD_3 2.599
-score MONEY_FRAUD_5 2.599
-score MONEY_FRAUD_8 1.959
+score MONEY_FORM_SHORT 1.683
+score MONEY_FRAUD_3 2.499
+score MONEY_FRAUD_5 2.899
+score MONEY_FRAUD_8 0.001 # force non-zero
score MONEY_FROM_MISSP 1.999
score MSM_PRIO_REPTO 2.499
-score NICE_REPLY_A -0.299
-score NORDNS_LOW_CONTRAST 1.886
+score NICE_REPLY_A -0.001
+score NORDNS_LOW_CONTRAST 1.783
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 0.830
-score OFFER_ONLY_AMERICA 2.000
-score PDS_BTC_ID 0.500
+score NSL_RCVD_HELO_USER 0.553
+score OFFER_ONLY_AMERICA 0.106
+score PDS_BTC_ID 0.499
score PDS_BTC_MSGID 0.001
-score PDS_EMPTYSUBJ_URISHRT 1.499
+score PDS_EMPTYSUBJ_URISHRT 1.100
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
-score PDS_FROM_2_EMAILS 2.099
+score PDS_FROM_2_EMAILS 1.699
score PDS_FROM_NAME_TO_DOMAIN 0.999
score PDS_NAKED_TO_NUMERO 1.999
score PDS_SHORTFWD_URISHRT 1.499
-score PDS_TINYSUBJ_URISHRT 1.499
+score PDS_TINYSUBJ_URISHRT 1.500
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
-score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
-score PDS_TO_EQ_FROM_NAME 0.001
+score PDS_TONAME_EQ_TOLOCAL_VSHORT 1.000
+score PDS_TO_EQ_FROM_NAME 3.379
score PHP_ORIG_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RATWARE_NO_RDNS 1.008
-score RISK_FREE 2.999
-score SENDGRID_REDIR 1.999
-score SENDGRID_REDIR_PHISH 3.499
-score SERGIO_SUBJECT_VIAGRA01 2.617
+score RATWARE_NO_RDNS 1.722
+score RCVD_DOTEDU_SHORT 2.499
+score RCVD_DOTEDU_SUSP_URI 0.304
+score RDNS_NUM_TLD_XM 2.999
+score RISK_FREE 2.899
+score SENDGRID_REDIR 1.499
+score SENDGRID_REDIR_PHISH 3.467
+score SERGIO_SUBJECT_VIAGRA01 3.299
score SHORTENED_URL_SRC 2.999
score SHORTENER_SHORT_IMG 0.001
-score SHORT_BODY_G_DRIVE_DYN 1.046
-score SHORT_SHORTNER 2.000
-score SHORT_URL 2.298
-score SINGLETS_LOW_CONTRAST 0.001
+score SHORT_BODY_G_DRIVE_DYN 1.480
+score SHORT_SHORTNER 1.999
+score SHORT_URL 1.768
+score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
score SPOOFED_FREEMAIL_NO_RDNS 1.499
score STATIC_XPRIO_OLE 1.999
-score STOCK_LOW_CONTRAST 2.500
-score STOX_BOUND_090909_B 1.936
-score SUBJ_OBFU_PUNCT_FEW 0.001
+score STOCK_LOW_CONTRAST 2.499
+score STOX_BOUND_090909_B 1.979
+score SUBJ_OBFU_PUNCT_FEW 0.026
score SUBJ_OBFU_PUNCT_MANY 1.749
score SUSP_UTF8_WORD_COMBO 0.001
-score SUSP_UTF8_WORD_FROM 0.450
-score SUSP_UTF8_WORD_SUBJ 1.999
-score THIS_AD 1.299
+score SUSP_UTF8_WORD_FROM 0.644
+score SUSP_UTF8_WORD_SUBJ 2.000
+score THIS_AD 0.099
score THIS_IS_ADV_SUSP_NTLD 0.001
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.499
-score TO_EQ_FM_DOM_HTML_IMG 0.200
-score TO_EQ_FM_DOM_HTML_ONLY 0.890
-score TO_EQ_FM_HTML_ONLY 0.796
+score TO_EQ_FM_DOM_HTML_IMG 0.001
+score TO_EQ_FM_DOM_HTML_ONLY 0.937
+score TO_EQ_FM_HTML_ONLY 0.337
score TO_IN_SUBJ 0.099
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score TO_NO_BRKTS_FROM_MSSP 1.874
+score TO_NO_BRKTS_HTML_IMG 1.999
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 2.500
-score TO_NO_BRKTS_NORDNS_HTML 1.999
-score TVD_RCVD_SPACE_BRACKET 4.299
-score TVD_SPACE_ENCODED 1.103
-score TVD_SPACE_RATIO_MINFP 1.620
-score UPGRADE_MAILBOX 1.087
-score URI_DOTEDU 2.000
-score URI_DOTEDU_ENTITY 2.919
-score URI_DOTEDU_LONG 2.286
-score URI_GOOGLE_PROXY 0.839
-score URI_IMG_WP_REDIR 2.999
-score URI_IN_URI_10 2.203
-score URI_IN_URI_5 2.440
+score TO_NO_BRKTS_MSFT 2.499
+score TO_NO_BRKTS_NORDNS_HTML 0.253
+score TO_NO_BRKTS_PCNT 2.499
+score TVD_RCVD_SPACE_BRACKET 4.500
+score TVD_SPACE_ENCODED 2.499
+score TVD_SPACE_RATIO_MINFP 0.061
+score UNICODE_OBFU_ASC 2.499
+score UPGRADE_MAILBOX 0.094
+score URI_DOTEDU 1.999
+score URI_DOTEDU_ENTITY 2.999
+score URI_DOTEDU_LONG 0.001
+score URI_GOOGLE_PROXY 0.104
+score URI_IMG_WP_REDIR 2.813
+score URI_IN_URI_10 2.811
+score URI_IN_URI_5 2.102
score URI_ONLY_MSGID_MALF 1.999
-score URI_PHISH 2.253
+score URI_PHISH 2.250
score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.938
-score URI_WPADMIN 2.700
-score URI_WP_DIRINDEX 3.499
-score URI_WP_HACKED 3.499
+score URI_TRY_3LD 0.001
+score URI_WPADMIN 2.699
+score URI_WP_DIRINDEX 2.498
+score URI_WP_HACKED 2.980
score URI_WP_HACKED_2 2.499
score XPRIO 2.249
-score XPRIO_SHORT_SUBJ 2.499
+score XPRIO_SHORT_SUBJ 2.500
+score AC_DIV_BONANZA 0.001
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
@@ -185,7 +199,6 @@
score AC_SPAMMY_URI_PATTERNS8 1.000
score AC_SPAMMY_URI_PATTERNS9 1.000
score ADVANCE_FEE_2_NEW_FORM 1.000
-score ADVANCE_FEE_3_NEW 1.000
score AD_PREFS 0.250
score ALIBABA_IMG_NOT_RCVD_ALI 1.000
score APP_DEVELOPMENT_FREEM 1.000
@@ -197,7 +210,6 @@
score BITCOIN_SPAM_01 1.000
score BITCOIN_SPAM_03 1.000
score BITCOIN_SPAM_06 1.000
-score BITCOIN_SPAM_07 1.000
score BITCOIN_SPAM_08 1.000
score BITCOIN_SPAM_09 1.000
score BITCOIN_SPAM_10 1.000
@@ -211,7 +223,6 @@
score BULK_RE_SUSP_NTLD 1.000
score CANT_SEE_AD 1.000
score COMMENT_GIBBERISH 1.000
-score COMPENSATION 1.000
score DAY_I_EARNED 1.000
score EBAY_IMG_NOT_RCVD_EBAY 1.000
score ENCRYPTED_MESSAGE -1.000
@@ -236,7 +247,6 @@
score HDRS_MISSP 1.000
score HEXHASH_WORD 1.000
score HK_CTE_RAW 1.000
-score HK_RCVD_IP_MULTICAST 1.000
score HOSTED_IMG_DQ_UNSUB 1.000
score HOSTED_IMG_FREEM 1.000
score HOSTED_IMG_MULTI 1.000
@@ -245,7 +255,6 @@
score HTML_SHRT_CMNT_OBFU_MANY 1.000
score LIST_PARTIAL_SHORT_MSG 1.000
score LIST_PRTL_PUMPDUMP 1.000
-score LONG_IMG_URI 1.000
score LUCRATIVE 1.000
score MALF_HTML_B64 1.000
score MALWARE_NORDNS 1.000
@@ -265,10 +274,7 @@
score PUMPDUMP 1.000
score PUMPDUMP_MULTI 1.000
score RAND_HEADER_MANY 1.000
-score RCVD_DOTEDU_SHORT 1.000
-score RCVD_DOTEDU_SUSP_URI 1.000
score RDNS_NUM_TLD_ATCHNX 1.000
-score RDNS_NUM_TLD_XM 1.000
score SEO_SUSP_NTLD 1.000
score SHOPIFY_IMG_NOT_RCVD_SFY 1.000
score SHORT_IMG_SUSP_NTLD 1.000
@@ -276,11 +282,8 @@
score SYSADMIN 1.000
score TO_EQ_FM_DIRECT_MX 1.000
score TO_NAME_SUBJ_NO_RDNS 1.000
-score TO_NO_BRKTS_HTML_IMG 1.000
-score TO_NO_BRKTS_PCNT 1.000
score TW_GIBBERISH_MANY 1.000
score UC_GIBBERISH_OBFU 1.000
-score UNICODE_OBFU_ASC 1.000
score UNICODE_OBFU_ZW 1.000
score URI_DATA 1.000
score URI_HEX_IP 1.000
diff --git a/rulesrc/scores/scores-set3 b/rulesrc/scores/scores-set3
index a0cb9e8..a1151c9 100644
--- a/rulesrc/scores/scores-set3
+++ b/rulesrc/scores/scores-set3
@@ -2,204 +2,204 @@
# ham-net-axb-coi-bulk.r1881840.log ham-net-axb-generic.r1881840.log ham-net-axb-ham-misc.r1881840.log ham-net-darxus.r1881840.log ham-net-ena-week0.r1881840.log ham-net-ena-week1.r1881840.log ham-net-ena-week2.r1881840.log ham-net-ena-week3.r1881840.log ham-net-ena-week4.r1881840.log ham-net-giovanni-ham.r1881840.log ham-net-giovanni-spammy.r1881840.log ham-net-giovanni-spam.r1881840.log ham-net-grenier.r1881840.log ham-net-jbrooks.r1881840.log ham-net-mmiroslaw-mails-ham.r1881840.log ham-net-mmiroslaw-mails-spam.r1881840.log ham-net-npiazzi.r1881840.log ham-net-pds.r1881840.log ham-net-sihde.r1881840.log ham-net-spamsponge.r1881840.log ham-net-thendrikx.r1881840.log spam-net-axb-coi-bulk.r1881840.log spam-net-axb-generic.r1881840.log spam-net-axb-ham-misc.r1881840.log spam-net-darxus.r1881840.log spam-net-ena-week0.r1881840.log spam-net-ena-week1.r1881840.log spam-net-ena-week2.r1881840.log spam-net-ena-week3.r1881840.log spam-net-ena-week4.r1881840.log spam-net-giovanni-ham.r1881840.log spam-net-giovanni-spammy.r1881840.log spam-net-giovanni-spam.r1881840.log spam-net-grenier.r1881840.log spam-net-jbrooks.r1881840.log spam-net-mmiroslaw-mails-ham.r1881840.log spam-net-mmiroslaw-mails-spam.r1881840.log spam-net-npiazzi.r1881840.log spam-net-pds.r1881840.log spam-net-sihde.r1881840.log spam-net-spamsponge.r1881840.log spam-net-thendrikx.r1881840.log
score AC_BR_BONANZA 0.001
-score AC_DIV_BONANZA 0.001 # force non-zero
-score AC_FROM_MANY_DOTS 1.285
+score AC_DIV_BONANZA 0.001
+score AC_FROM_MANY_DOTS 0.866
score AC_HTML_NONSENSE_TAGS 1.999
score AC_POST_EXTRAS 0.001
score ADMITS_SPAM 0.001
score ADVANCE_FEE_2_NEW_MONEY 1.999
score ADVANCE_FEE_3_NEW 3.499
-score ADVANCE_FEE_3_NEW_MONEY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 1.971
+score ADVANCE_FEE_3_NEW_MONEY 0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_MONEY 1.146
score ADVANCE_FEE_5_NEW 2.699
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
-score AXB_XMAILER_MIMEOLE_OL_024C2 0.061
-score BITCOIN_DEADLINE 2.612
-score BITCOIN_EXTORT_01 4.059
+score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
+score BITCOIN_DEADLINE 2.760
+score BITCOIN_EXTORT_01 4.357
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_SPAM_02 1.523
-score BITCOIN_SPAM_04 1.499
-score BITCOIN_SPAM_05 1.093
-score BITCOIN_SPAM_07 3.440
-score BITCOIN_XPRIO 1.269
-score BITCOIN_YOUR_INFO 0.615
+score BITCOIN_SPAM_02 2.100
+score BITCOIN_SPAM_04 1.498
+score BITCOIN_SPAM_05 2.455
+score BITCOIN_SPAM_07 3.499
+score BITCOIN_XPRIO 1.258
+score BITCOIN_YOUR_INFO 0.462
score BODY_URI_ONLY 0.001
-score BOGUS_MIME_VERSION 2.296
-score CK_HELO_DYNAMIC_SPLIT_IP 1.499
-score CK_HELO_GENERIC 0.250
-score CTE_8BIT_MISMATCH 1.000
-score CTYPE_NULL 2.399
+score BOGUS_MIME_VERSION 3.499
+score CK_HELO_DYNAMIC_SPLIT_IP 1.498
+score CK_HELO_GENERIC 0.249
+score CTE_8BIT_MISMATCH 0.999
+score CTYPE_NULL 2.499
score DKIMWL_BL 2.999
-score DKIMWL_WL_HIGH -1.501
+score DKIMWL_WL_HIGH -1.455
score DKIMWL_WL_MED -0.001
score DOTGOV_IMAGE 2.999
score DSN_NO_MIMEVERSION 1.999
score DX_TEXT_03 0.299
-score END_FUTURE_EMAILS 1.050
+score END_FUTURE_EMAILS 1.039
score FILL_THIS_FORM 0.001
-score FONT_INVIS_DIRECT 0.001
-score FONT_INVIS_DOTGOV 0.001 # force non-zero
-score FONT_INVIS_LONG_LINE 1.567
+score FONT_INVIS_DIRECT 0.001 # force non-zero
+score FONT_INVIS_DOTGOV 0.001
+score FONT_INVIS_LONG_LINE 1.564
score FONT_INVIS_MSGID 0.001
-score FONT_INVIS_POSTEXTRAS 0.001
-score FORGED_RELAY_MUA_TO_MX 3.715
-score FORGED_SPF_HELO 1.499
-score FORM_FRAUD 0.999
+score FONT_INVIS_POSTEXTRAS 2.411
+score FORGED_RELAY_MUA_TO_MX 3.670
+score FORGED_SPF_HELO 1.498
+score FORM_FRAUD 0.998
score FORM_FRAUD_5 2.699
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.250
+score FREEMAIL_FORGED_FROMDOMAIN 0.248
score FROM_2_EMAILS_SHORT 1.999
-score FROM_ADDR_WS 2.854
+score FROM_ADDR_WS 2.745
score FROM_FMBLA_NEWDOM 1.499
-score FROM_FMBLA_NEWDOM14 0.999
+score FROM_FMBLA_NEWDOM14 0.998
score FROM_FMBLA_NEWDOM28 0.649
-score FROM_GOV_DKIM_AU -1.000
+score FROM_GOV_DKIM_AU -0.998
score FROM_GOV_SPOOF 0.999
score FROM_MISSPACED 0.001
-score FROM_MISSP_DYNIP 1.513
+score FROM_MISSP_DYNIP 2.599
score FROM_MISSP_EH_MATCH 0.001
-score FROM_MISSP_FREEMAIL 0.143
+score FROM_MISSP_FREEMAIL 2.347
score FROM_MISSP_MSFT 0.001
score FROM_MISSP_REPLYTO 0.001
score FROM_MISSP_SPF_FAIL 1.999
-score FROM_MISSP_TO_UNDISC 0.001
+score FROM_MISSP_TO_UNDISC 1.229
score FROM_MISSP_USER 0.001
-score FROM_MISSP_XPRIO 0.001
-score FROM_NAME_EQ_TO_G_DRIVE 0.001
-score FROM_NTLD_REPLY_FREEMAIL 1.906
+score FROM_MISSP_XPRIO 0.001 # force non-zero
+score FROM_NAME_EQ_TO_G_DRIVE 1.430
+score FROM_NTLD_REPLY_FREEMAIL 1.999
score FROM_SUSPICIOUS_NTLD 0.499
-score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_UNBAL1 2.344
-score FROM_URI 2.306
-score FROM_WORDY 2.081
-score FROM_WWW 2.442
+score FROM_SUSPICIOUS_NTLD_FP 1.997
+score FROM_UNBAL1 2.406
+score FROM_URI 1.346
+score FROM_WORDY 2.499
+score FROM_WWW 2.399
score FSL_BULK_SIG 0.001 # force non-zero
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
-score FSL_THIS_IS_ADV 0.447
+score FSL_THIS_IS_ADV 0.001
score FUZZY_WALLET 2.199
-score GB_BITCOIN_CP 1.767
-score GB_FREEMAIL_DISPTO 0.001 # force non-zero
+score GB_BITCOIN_CP 0.403
+score GB_FREEMAIL_DISPTO 0.001
score GB_GOOGLE_OBFUS 0.749
score HDRS_LCASE 0.100
score HDRS_LCASE_IMGONLY 0.099
-score HDR_ORDER_FTSDMCXX_DIRECT 0.812
+score HDR_ORDER_FTSDMCXX_DIRECT 0.811
score HDR_ORDER_FTSDMCXX_NORDNS 2.898
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
-score HELO_MISC_IP 0.094
-score HELO_NO_DOMAIN 0.001 # force non-zero
+score HELO_MISC_IP 0.053
+score HELO_NO_DOMAIN 0.001
score HK_RANDOM_FROM 0.001
-score HK_RANDOM_REPLYTO 0.999
+score HK_RANDOM_REPLYTO 0.998
score HK_SCAM 0.001
-score HOSTED_IMG_DIRECT_MX 1.750
-score HTML_OFF_PAGE 0.001 # force non-zero
-score HTML_SINGLET_MANY 0.001 # force non-zero
-score HTML_TEXT_INVISIBLE_FONT 2.013
-score HTML_TEXT_INVISIBLE_STYLE 1.783
-score IMG_ONLY_FM_DOM_INFO 2.426
+score HOSTED_IMG_DIRECT_MX 1.558
+score HTML_OFF_PAGE 0.001
+score HTML_SINGLET_MANY 0.001
+score HTML_TEXT_INVISIBLE_FONT 2.003
+score HTML_TEXT_INVISIBLE_STYLE 2.533
+score IMG_ONLY_FM_DOM_INFO 2.442
score KB_FORGED_MOZ4 4.499
-score KHOP_FAKE_EBAY 0.899
-score KHOP_HELO_FCRDNS 0.400
+score KHOP_FAKE_EBAY 0.119
+score KHOP_HELO_FCRDNS 0.399
score LH_URI_DOM_IN_PATH 0.001
-score LIST_PRTL_SAME_USER 1.818
-score LONG_HEX_URI 0.001 # force non-zero
-score LONG_IMG_URI 0.001 # force non-zero
-score LONG_INVISIBLE_TEXT 1.850
+score LIST_PRTL_SAME_USER 0.791
+score LONG_HEX_URI 0.001
+score LONG_IMG_URI 0.001
+score LONG_INVISIBLE_TEXT 1.848
score LOTS_OF_MONEY 0.010
score MANY_SPAN_IN_TEXT 1.435
score MILLION_HUNDRED 0.001
score MIMEOLE_DIRECT_TO_MX 0.001
score MIME_NO_TEXT 0.001
-score MIXED_ES 2.499
+score MIXED_ES 2.497
score MONEY_FORM_SHORT 0.001
-score MONEY_FRAUD_3 1.916
-score MONEY_FRAUD_5 0.710
+score MONEY_FRAUD_3 1.907
+score MONEY_FRAUD_5 1.534
score MONEY_FRAUD_8 0.001
-score MONEY_FROM_MISSP 1.236
+score MONEY_FROM_MISSP 0.001
score MSM_PRIO_REPTO 2.499
score NICE_REPLY_A -0.001
-score NORDNS_LOW_CONTRAST 0.912
+score NORDNS_LOW_CONTRAST 0.910
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 0.650
+score NSL_RCVD_HELO_USER 0.174
score PDS_BTC_ID 0.499
-score PDS_BTC_MSGID 0.001
+score PDS_BTC_MSGID 0.011
score PDS_EMPTYSUBJ_URISHRT 0.001
score PDS_FREEMAIL_REPLYTO_URISHRT 1.499
score PDS_FRNOM_TODOM_NAKED_TO 1.499
score PDS_FROM_2_EMAILS 1.499
-score PDS_FROM_NAME_TO_DOMAIN 0.999
+score PDS_FROM_NAME_TO_DOMAIN 1.000
score PDS_NAKED_TO_NUMERO 1.999
score PDS_SHORTFWD_URISHRT 1.499
-score PDS_TINYSUBJ_URISHRT 0.567
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.397
+score PDS_TINYSUBJ_URISHRT 0.592
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 0.972
score PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE 1.999
score PDS_TONAME_EQ_TOLOCAL_VSHORT 0.999
score PDS_TO_EQ_FROM_NAME 3.399
score PHP_ORIG_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.001
-score RATWARE_NO_RDNS 0.977
-score RCVD_DOTEDU_SHORT 2.490
-score RCVD_DOTEDU_SUSP_URI 0.001 # force non-zero
+score RATWARE_NO_RDNS 1.627
+score RCVD_DOTEDU_SHORT 2.401
+score RCVD_DOTEDU_SUSP_URI 0.001
score RCVD_IN_MSPIKE_H2 -0.001
-score RDNS_NUM_TLD_XM 1.321
-score RISK_FREE 2.599
-score SENDGRID_REDIR 1.499
-score SENDGRID_REDIR_PHISH 3.499
+score RDNS_NUM_TLD_XM 0.352
+score RISK_FREE 2.699
+score SENDGRID_REDIR 1.498
+score SENDGRID_REDIR_PHISH 3.393
score SERGIO_SUBJECT_VIAGRA01 3.599
score SHORTENED_URL_SRC 2.699
-score SHORTENER_SHORT_IMG 0.714
-score SHORT_BODY_G_DRIVE_DYN 0.823
-score SHORT_SHORTNER 1.999
-score SHORT_URL 0.047
-score SINGLETS_LOW_CONTRAST 0.001 # force non-zero
-score SPOOFED_FREEMAIL 1.652
-score SPOOFED_FREEMAIL_NO_RDNS 0.001
-score SPOOFED_FREEM_REPTO 1.042
-score SPOOFED_FREEM_REPTO_CHN 1.296
+score SHORTENER_SHORT_IMG 1.728
+score SHORT_BODY_G_DRIVE_DYN 0.001
+score SHORT_SHORTNER 1.997
+score SHORT_URL 0.440
+score SINGLETS_LOW_CONTRAST 0.001
+score SPOOFED_FREEMAIL 1.997
+score SPOOFED_FREEMAIL_NO_RDNS 0.001 # force non-zero
+score SPOOFED_FREEM_REPTO 0.694
+score SPOOFED_FREEM_REPTO_CHN 0.660
score STATIC_XPRIO_OLE 1.999
-score STOCK_LOW_CONTRAST 0.055
-score STOX_BOUND_090909_B 2.399
-score SUBJ_OBFU_PUNCT_FEW 0.009
+score STOCK_LOW_CONTRAST 0.001
+score STOX_BOUND_090909_B 2.299
+score SUBJ_OBFU_PUNCT_FEW 0.008
score SUBJ_OBFU_PUNCT_MANY 0.001
score SUSP_UTF8_WORD_COMBO 2.999
score SUSP_UTF8_WORD_FROM 1.999
score SUSP_UTF8_WORD_SUBJ 1.999
score THIS_AD 0.899
score THIS_IS_ADV_SUSP_NTLD 0.001
-score TONOM_EQ_TOLOC_SHRT_SHRTNER 0.505
-score TO_EQ_FM_DOM_HTML_IMG 0.001
-score TO_EQ_FM_DOM_HTML_ONLY 1.071
+score TONOM_EQ_TOLOC_SHRT_SHRTNER 0.558
+score TO_EQ_FM_DOM_HTML_IMG 0.600
+score TO_EQ_FM_DOM_HTML_ONLY 1.899
score TO_EQ_FM_DOM_SPF_FAIL 0.001
-score TO_EQ_FM_HTML_ONLY 0.733
+score TO_EQ_FM_HTML_ONLY 0.332
score TO_EQ_FM_SPF_FAIL 0.001
score TO_IN_SUBJ 0.099
-score TO_NO_BRKTS_FROM_MSSP 2.499
+score TO_NO_BRKTS_FROM_MSSP 2.097
score TO_NO_BRKTS_HTML_IMG 1.787
score TO_NO_BRKTS_HTML_ONLY 1.999
-score TO_NO_BRKTS_MSFT 0.407
-score TO_NO_BRKTS_NORDNS_HTML 1.999
+score TO_NO_BRKTS_MSFT 0.001
+score TO_NO_BRKTS_NORDNS_HTML 1.997
score TVD_RCVD_SPACE_BRACKET 4.499
-score TVD_SPACE_ENCODED 2.195
+score TVD_SPACE_ENCODED 1.779
score TVD_SPACE_RATIO_MINFP 0.001
-score UNICODE_OBFU_ASC 2.500
-score UPGRADE_MAILBOX 0.972
+score UNICODE_OBFU_ASC 2.499
+score UPGRADE_MAILBOX 0.274
score URI_DOTEDU 0.001
score URI_DOTEDU_ENTITY 2.999
-score URI_DOTEDU_LONG 0.001
-score URI_GOOGLE_PROXY 0.133
+score URI_DOTEDU_LONG 0.001 # force non-zero
+score URI_GOOGLE_PROXY 0.132
score URI_IMG_WP_REDIR 2.999
-score URI_IN_URI_10 3.693
-score URI_IN_URI_5 2.548
-score URI_ONLY_MSGID_MALF 1.813
+score URI_IN_URI_10 2.492
+score URI_IN_URI_5 2.542
+score URI_ONLY_MSGID_MALF 1.081
score URI_PHISH 3.999
-score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.999
+score URI_PHP_REDIR 3.496
+score URI_TRY_3LD 1.997
score URI_WPADMIN 2.399
score URI_WP_DIRINDEX 3.499
score URI_WP_HACKED 3.499
-score URI_WP_HACKED_2 2.499
-score XPRIO_SHORT_SUBJ 2.499
+score URI_WP_HACKED_2 2.497
+score XPRIO_SHORT_SUBJ 1.428
score AC_SPAMMY_URI_PATTERNS1 1.000
score AC_SPAMMY_URI_PATTERNS10 1.000
score AC_SPAMMY_URI_PATTERNS11 1.000
diff --git a/rulesrc/scores/stats-set0 b/rulesrc/scores/stats-set0
index 26d0994..3721bd0 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: 852417 44.015% (99.670% of non-spam corpus)
-# Correctly spam: 906528 46.809% (83.829% of spam corpus)
-# False positives: 2825 0.146% (0.330% of nonspam, 109217 weighted)
-# False negatives: 174875 9.030% (16.171% of spam, 430371 weighted)
-# Average score for spam: 9.1 nonspam: 0.5
-# Average for false-pos: 6.1 false-neg: 2.5
-# TOTAL: 1936645 100.00%
+# Correctly non-spam: 167397 14.200% (99.039% of non-spam corpus)
+# Correctly spam: 716303 60.763% (70.934% of spam corpus)
+# False positives: 1624 0.138% (0.961% of nonspam, 287041 weighted)
+# False negatives: 293520 24.899% (29.066% of spam, 1017291 weighted)
+# Average score for spam: 8.4 nonspam: 0.8
+# Average for false-pos: 5.9 false-neg: 3.5
+# TOTAL: 1178844 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 106272 99.61%
-# Correctly spam: 113578 84.20%
-# False positives: 413 0.39%
-# False negatives: 21318 15.80%
-# TCR(l=50): 3.214258 SpamRecall: 84.197% SpamPrec: 99.638%
+# Correctly non-spam: 21081 99.03%
+# Correctly spam: 101626 80.63%
+# False positives: 207 0.97%
+# False negatives: 24412 19.37%
+# TCR(l=50): 3.625741 SpamRecall: 80.631% SpamPrec: 99.797%
##### 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: 846372 98.96%
-# Correctly spam: 359871 33.28%
-# False positives: 8870 1.04%
-# False negatives: 721532 66.72%
-# TCR(l=50): 0.928217 SpamRecall: 33.278% SpamPrec: 97.595%
+# Correctly non-spam: 160932 95.21%
+# Correctly spam: 330753 32.75%
+# False positives: 8089 4.79%
+# False negatives: 679070 67.25%
+# TCR(l=50): 0.931984 SpamRecall: 32.754% SpamPrec: 97.613%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 105635 99.02%
-# Correctly spam: 45063 33.41%
-# False positives: 1050 0.98%
-# False negatives: 89833 66.59%
-# TCR(l=50): 0.947749 SpamRecall: 33.406% SpamPrec: 97.723%
+# Correctly non-spam: 20255 95.15%
+# Correctly spam: 41314 32.78%
+# False positives: 1033 4.85%
+# False negatives: 84724 67.22%
+# TCR(l=50): 0.924208 SpamRecall: 32.779% SpamPrec: 97.561%
diff --git a/rulesrc/scores/stats-set1 b/rulesrc/scores/stats-set1
index cc95fde..15f5648 100644
--- a/rulesrc/scores/stats-set1
+++ b/rulesrc/scores/stats-set1
@@ -1,40 +1,40 @@
##### WITH NEW RULES AND SCORES #####
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 181078 14.854% (98.783% of non-spam corpus)
-# Correctly spam: 967943 79.402% (93.455% of spam corpus)
-# False positives: 2230 0.183% (1.217% of nonspam, 1034045 weighted)
-# False negatives: 67787 5.561% (6.545% of spam, 136893 weighted)
+# Correctly non-spam: 181080 14.855% (98.789% of non-spam corpus)
+# Correctly spam: 966637 79.297% (93.331% of spam corpus)
+# False positives: 2219 0.182% (1.211% of nonspam, 1031121 weighted)
+# False negatives: 69073 5.666% (6.669% of spam, 143770 weighted)
# Average score for spam: 13.2 nonspam: -0.8
-# Average for false-pos: 8.2 false-neg: 2.0
-# TOTAL: 1219038 100.00%
+# Average for false-pos: 8.2 false-neg: 2.1
+# TOTAL: 1219009 100.00%
Reading scores from "tmprules"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 22720 98.71%
-# Correctly spam: 120936 93.53%
-# False positives: 297 1.29%
-# False negatives: 8360 6.47%
-# TCR(l=50): 5.570702 SpamRecall: 93.534% SpamPrec: 99.755%
+# Correctly non-spam: 22718 98.70%
+# Correctly spam: 120857 93.47%
+# False positives: 299 1.30%
+# False negatives: 8438 6.53%
+# TCR(l=50): 5.528262 SpamRecall: 93.474% SpamPrec: 99.753%
##### 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: 180221 98.32%
-# Correctly spam: 604549 58.37%
-# False positives: 3087 1.68%
-# False negatives: 431181 41.63%
-# TCR(l=50): 1.768873 SpamRecall: 58.369% SpamPrec: 99.492%
+# Correctly non-spam: 180209 98.31%
+# Correctly spam: 604631 58.38%
+# False positives: 3090 1.69%
+# False negatives: 431079 41.62%
+# TCR(l=50): 1.768694 SpamRecall: 58.378% SpamPrec: 99.492%
Reading scores from "../rules-base"...
Reading per-message hit stat logs and scores...
# SUMMARY for threshold 5.0:
-# Correctly non-spam: 22641 98.37%
-# Correctly spam: 75590 58.46%
-# False positives: 376 1.63%
-# False negatives: 53706 41.54%
-# TCR(l=50): 1.783246 SpamRecall: 58.463% SpamPrec: 99.505%
+# Correctly non-spam: 22643 98.38%
+# Correctly spam: 75574 58.45%
+# False positives: 374 1.62%
+# False negatives: 53721 41.55%
+# TCR(l=50): 1.785325 SpamRecall: 58.451% SpamPrec: 99.508%
