From 28d53fce303a12a3e38ef9ccfc0d263c9d1aa64b Mon Sep 17 00:00:00 2001
From: Bartosz Nitka <bnitka@fb.com>
Date: Tue, 14 Mar 2017 04:50:10 -0700
Subject: [PATCH] Remove ruleIntersect2

Summary:
It is no longer necessary after D4676812 and D4698788.
`"I have 9 am 12 pm 1 pm 2pm 4 pm 3 pm on Saturday"` now works in
less than a second, it used to be 10s.

The test suite also got 3s faster.

Reviewed By: patapizza

Differential Revision: D4701890

fbshipit-source-id: 107a55f
---
 Duckling/Ranking/Classifiers/DA.hs |  700 +++++++----------
 Duckling/Ranking/Classifiers/EN.hs | 1119 +++++++++++-----------------
 Duckling/Ranking/Classifiers/NB.hs |  693 +++++++----------
 Duckling/Ranking/Classifiers/PT.hs |  555 ++++++--------
 Duckling/Ranking/Classifiers/SV.hs |  786 ++++++++-----------
 Duckling/Time/DA/Rules.hs          |   14 -
 Duckling/Time/EN/Rules.hs          |   13 -
 Duckling/Time/NB/Rules.hs          |   14 -
 Duckling/Time/PT/Rules.hs          |   14 -
 Duckling/Time/SV/Rules.hs          |   14 -
 10 files changed, 1443 insertions(+), 2479 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/DA.hs b/Duckling/Ranking/Classifiers/DA.hs
index 8b59ccbd..96a57e5d 100644
--- a/Duckling/Ranking/Classifiers/DA.hs
+++ b/Duckling/Ranking/Classifiers/DA.hs
@@ -54,150 +54,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("intersect2",
-        Classifier{okData =
-                     ClassData{prior = -0.46724246780440765,
-                               unseen = -5.869296913133774,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.074708587705242),
-                                    ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.074708587705242),
-                                    ("hourday", -5.173320876373351),
-                                    ("dayhour", -2.9220290777668563),
-                                    ("daymonth", -3.1584178558310865),
-                                    ("monthyear", -3.0938793346935154),
-                                    ("intersecthh:mm", -5.173320876373351),
-                                    ("the <day-of-month> (ordinal)named-month",
-                                     -3.9205579078779835),
-                                    ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.767855768265187),
-                                    ("intersect2hh:mm", -5.173320876373351),
-                                    ("last <day-of-week> of <time>year", -4.767855768265187),
-                                    ("todayat <time-of-day>", -4.767855768265187),
-                                    ("dayday", -3.033254712877081),
-                                    ("dd/mmat <time-of-day>", -4.257030144499196),
-                                    ("intersect by \",\"hh:mm", -4.074708587705242),
-                                    ("absorption of , after named dayintersect2",
-                                     -5.173320876373351),
-                                    ("intersectnamed-month", -5.173320876373351),
-                                    ("dayyear", -3.3015186994717602),
-                                    ("named-daythis <time>", -3.4685727841349263),
-                                    ("tomorrow<time-of-day> sharp", -4.767855768265187),
-                                    ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.767855768265187),
-                                    ("named-day<time> timezone", -4.480173695813406),
-                                    ("named-monthyear", -3.0938793346935154),
-                                    ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.074708587705242),
-                                    ("tomorrowuntil <time-of-day>", -4.767855768265187),
-                                    ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.480173695813406),
-                                    ("intersect2named-month", -5.173320876373351),
-                                    ("after <time-of-day>at <time-of-day>", -4.767855768265187),
-                                    ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.767855768265187),
-                                    ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.173320876373351),
-                                    ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.173320876373351),
-                                    ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.767855768265187),
-                                    ("named-daynext <cycle>", -5.173320876373351),
-                                    ("named-dayintersect", -5.173320876373351),
-                                    ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.767855768265187),
-                                    ("tomorrowafter <time-of-day>", -4.767855768265187),
-                                    ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.257030144499196),
-                                    ("dayminute", -2.647592232065096),
-                                    ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.480173695813406),
-                                    ("<ordinal> <cycle> of <time>year", -4.767855768265187),
-                                    ("minuteday", -2.570631190928968),
-                                    ("absorption of , after named dayintersect",
-                                     -5.173320876373351),
-                                    ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.173320876373351),
-                                    ("named-dayon <date>", -5.173320876373351),
-                                    ("named-dayat <time-of-day>", -4.767855768265187),
-                                    ("named-dayintersect2", -5.173320876373351),
-                                    ("yearhh:mm", -5.173320876373351),
-                                    ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.173320876373351),
-                                    ("absorption of , after named dayintersect by \",\"",
-                                     -4.480173695813406),
-                                    ("dd/mmyear", -4.767855768265187),
-                                    ("at <time-of-day>on <date>", -5.173320876373351),
-                                    ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.173320876373351),
-                                    ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.173320876373351),
-                                    ("dayweek", -4.074708587705242),
-                                    ("weekyear", -4.257030144499196),
-                                    ("hh:mmtomorrow", -4.480173695813406),
-                                    ("tomorrowat <time-of-day>", -3.9205579078779835),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.173320876373351),
-                                    ("at <time-of-day>tomorrow", -4.767855768265187),
-                                    ("last <cycle> of <time>year", -4.257030144499196),
-                                    ("named-daythe <day-of-month> (non ordinal)",
-                                     -5.173320876373351),
-                                    ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.767855768265187),
-                                    ("yearminute", -5.173320876373351)],
-                               n = 136},
-                   koData =
-                     ClassData{prior = -0.9854481988680208, unseen = -5.497168225293202,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("named-daynamed-month", -4.799914262780603),
-                                    ("dayhour", -3.4136199016607125),
-                                    ("daymonth", -1.9965538818740682),
-                                    ("monthday", -3.883623530906448),
-                                    ("monthyear", -3.883623530906448),
-                                    ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.5471512942852352),
-                                    ("named-dayhh:mm", -4.799914262780603),
-                                    ("dd/mmat <time-of-day>", -3.883623530906448),
-                                    ("hourhour", -3.5471512942852352),
-                                    ("dayyear", -3.4136199016607125),
-                                    ("named-daythis <time>", -2.3575672274113986),
-                                    ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.394449154672439),
-                                    ("minutemonth", -4.394449154672439),
-                                    ("named-monthyear", -3.883623530906448),
-                                    ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.394449154672439),
-                                    ("absorption of , after named daynamed-month",
-                                     -3.7013019741124937),
-                                    ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.394449154672439),
-                                    ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.394449154672439),
-                                    ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.799914262780603),
-                                    ("until <time-of-day>on <date>", -4.799914262780603),
-                                    ("dayminute", -3.4136199016607125),
-                                    ("minuteday", -3.295836866004329),
-                                    ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.799914262780603),
-                                    ("named-dayat <time-of-day>", -3.883623530906448),
-                                    ("hh:mmon <date>", -3.4136199016607125),
-                                    ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.799914262780603),
-                                    ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -3.883623530906448),
-                                    ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -3.883623530906448),
-                                    ("this <part-of-day>until <time-of-day>", -4.394449154672439),
-                                    ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.394449154672439),
-                                    ("tomorrownoon", -4.799914262780603),
-                                    ("this <time>until <time-of-day>", -4.394449154672439),
-                                    ("minuteyear", -4.394449154672439),
-                                    ("yearminute", -4.394449154672439)],
-                               n = 81}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -0.5596157879354228, unseen = -2.772588722239781,
@@ -316,23 +172,22 @@ classifiers
                                n = 2}}),
        ("between <datetime> and <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -0.916290731874155, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2039728043259361),
-                                    ("hh:mmhh:mm", -1.2039728043259361)],
+                                   [("minuteminute", -1.0986122886681098),
+                                    ("hh:mmhh:mm", -1.0986122886681098)],
                                n = 2},
                    koData =
-                     ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
+                     ClassData{prior = -0.5108256237659907,
+                               unseen = -2.4849066497880004,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.540445040947149),
-                                    ("minuteminute", -1.540445040947149),
-                                    ("minutehour", -1.540445040947149),
-                                    ("hh:mmintersect", -1.9459101490553135),
-                                    ("hh:mmintersect2", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("hh:mmtime-of-day (latent)", -1.2992829841302609),
+                                    ("minuteminute", -1.7047480922384253),
+                                    ("minutehour", -1.2992829841302609),
+                                    ("hh:mmintersect", -1.7047480922384253)],
+                               n = 3}}),
        ("month (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -393,166 +248,158 @@ classifiers
                                n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.46724246780440765,
-                               unseen = -5.869296913133774,
+                     ClassData{prior = -0.46117571512217015, unseen = -5.8111409929767,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.074708587705242),
+                                     -4.0163830207523885),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.074708587705242),
-                                    ("hourday", -5.173320876373351),
-                                    ("dayhour", -2.9220290777668563),
-                                    ("daymonth", -3.1584178558310865),
-                                    ("monthyear", -3.0938793346935154),
-                                    ("intersecthh:mm", -5.173320876373351),
+                                     -4.0163830207523885),
+                                    ("hourday", -5.1149953094204985),
+                                    ("dayhour", -2.863703510814003),
+                                    ("daymonth", -3.3232358401924436),
+                                    ("monthyear", -3.0355537677406628),
+                                    ("intersecthh:mm", -5.1149953094204985),
                                     ("the <day-of-month> (ordinal)named-month",
-                                     -3.9205579078779835),
+                                     -3.8622323409251305),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.767855768265187),
-                                    ("intersect2hh:mm", -5.173320876373351),
-                                    ("last <day-of-week> of <time>year", -4.767855768265187),
-                                    ("todayat <time-of-day>", -4.767855768265187),
-                                    ("dayday", -3.033254712877081),
-                                    ("dd/mmat <time-of-day>", -4.257030144499196),
-                                    ("intersect by \",\"hh:mm", -4.074708587705242),
-                                    ("absorption of , after named dayintersect2",
-                                     -5.173320876373351),
-                                    ("intersectnamed-month", -5.173320876373351),
-                                    ("dayyear", -3.3015186994717602),
-                                    ("named-daythis <time>", -3.4685727841349263),
-                                    ("tomorrow<time-of-day> sharp", -4.767855768265187),
+                                     -4.709530201312334),
+                                    ("last <day-of-week> of <time>year", -4.709530201312334),
+                                    ("todayat <time-of-day>", -4.709530201312334),
+                                    ("dayday", -3.0355537677406628),
+                                    ("dd/mmat <time-of-day>", -4.198704577546343),
+                                    ("intersect by \",\"hh:mm", -4.198704577546343),
+                                    ("intersectnamed-month", -5.1149953094204985),
+                                    ("dayyear", -3.243193132518907),
+                                    ("named-daythis <time>", -3.6109179126442243),
+                                    ("tomorrow<time-of-day> sharp", -4.709530201312334),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.767855768265187),
-                                    ("named-day<time> timezone", -4.480173695813406),
-                                    ("named-monthyear", -3.0938793346935154),
+                                     -4.709530201312334),
+                                    ("named-day<time> timezone", -4.421848128860553),
+                                    ("named-monthyear", -3.0355537677406628),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.074708587705242),
-                                    ("tomorrowuntil <time-of-day>", -4.767855768265187),
+                                     -4.0163830207523885),
+                                    ("tomorrowuntil <time-of-day>", -4.709530201312334),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.480173695813406),
-                                    ("intersect2named-month", -5.173320876373351),
-                                    ("after <time-of-day>at <time-of-day>", -4.767855768265187),
+                                     -4.421848128860553),
+                                    ("after <time-of-day>at <time-of-day>", -4.709530201312334),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.767855768265187),
+                                     -4.709530201312334),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.173320876373351),
+                                     -5.1149953094204985),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.173320876373351),
+                                     -5.1149953094204985),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.767855768265187),
-                                    ("named-daynext <cycle>", -5.173320876373351),
-                                    ("named-dayintersect", -5.173320876373351),
+                                     -4.709530201312334),
+                                    ("named-daynext <cycle>", -5.1149953094204985),
+                                    ("named-dayintersect", -5.1149953094204985),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.767855768265187),
-                                    ("tomorrowafter <time-of-day>", -4.767855768265187),
+                                     -4.709530201312334),
+                                    ("tomorrowafter <time-of-day>", -4.709530201312334),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.257030144499196),
-                                    ("dayminute", -2.647592232065096),
+                                     -4.198704577546343),
+                                    ("dayminute", -2.763620052257021),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.480173695813406),
-                                    ("<ordinal> <cycle> of <time>year", -4.767855768265187),
-                                    ("minuteday", -2.570631190928968),
+                                     -4.421848128860553),
+                                    ("<ordinal> <cycle> of <time>year", -4.709530201312334),
+                                    ("minuteday", -2.512305623976115),
                                     ("absorption of , after named dayintersect",
-                                     -5.173320876373351),
+                                     -5.1149953094204985),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.173320876373351),
-                                    ("named-dayon <date>", -5.173320876373351),
-                                    ("named-dayat <time-of-day>", -4.767855768265187),
-                                    ("named-dayintersect2", -5.173320876373351),
-                                    ("yearhh:mm", -5.173320876373351),
+                                     -5.1149953094204985),
+                                    ("named-dayon <date>", -5.1149953094204985),
+                                    ("named-dayat <time-of-day>", -4.709530201312334),
+                                    ("yearhh:mm", -5.1149953094204985),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.173320876373351),
+                                     -5.1149953094204985),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -4.480173695813406),
-                                    ("dd/mmyear", -4.767855768265187),
-                                    ("at <time-of-day>on <date>", -5.173320876373351),
+                                     -4.709530201312334),
+                                    ("dd/mmyear", -4.709530201312334),
+                                    ("at <time-of-day>on <date>", -5.1149953094204985),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.173320876373351),
+                                     -5.1149953094204985),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.173320876373351),
-                                    ("dayweek", -4.074708587705242),
-                                    ("weekyear", -4.257030144499196),
-                                    ("hh:mmtomorrow", -4.480173695813406),
-                                    ("tomorrowat <time-of-day>", -3.9205579078779835),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.173320876373351),
-                                    ("at <time-of-day>tomorrow", -4.767855768265187),
-                                    ("last <cycle> of <time>year", -4.257030144499196),
+                                     -5.1149953094204985),
+                                    ("dayweek", -4.0163830207523885),
+                                    ("weekyear", -4.198704577546343),
+                                    ("hh:mmtomorrow", -4.421848128860553),
+                                    ("tomorrowat <time-of-day>", -3.8622323409251305),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.1149953094204985),
+                                    ("at <time-of-day>tomorrow", -4.709530201312334),
+                                    ("last <cycle> of <time>year", -4.198704577546343),
                                     ("named-daythe <day-of-month> (non ordinal)",
-                                     -5.173320876373351),
+                                     -5.1149953094204985),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.767855768265187),
-                                    ("yearminute", -5.173320876373351)],
-                               n = 136},
+                                     -4.709530201312334),
+                                    ("yearminute", -5.1149953094204985)],
+                               n = 128},
                    koData =
-                     ClassData{prior = -0.9854481988680208, unseen = -5.497168225293202,
+                     ClassData{prior = -0.9957178655054769, unseen = -5.429345628954441,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -4.799914262780603),
-                                    ("dayhour", -3.4136199016607125),
-                                    ("daymonth", -1.9965538818740682),
-                                    ("monthday", -3.883623530906448),
-                                    ("monthyear", -3.883623530906448),
+                                   [("named-daynamed-month", -4.7318028369214575),
+                                    ("dayhour", -3.3455084758015667),
+                                    ("daymonth", -2.129113151477074),
+                                    ("monthday", -3.8155121050473024),
+                                    ("monthyear", -3.8155121050473024),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.5471512942852352),
-                                    ("named-dayhh:mm", -4.799914262780603),
-                                    ("dd/mmat <time-of-day>", -3.883623530906448),
-                                    ("hourhour", -3.5471512942852352),
-                                    ("dayyear", -3.4136199016607125),
-                                    ("named-daythis <time>", -2.3575672274113986),
+                                     -3.4790398684260895),
+                                    ("named-dayhh:mm", -4.7318028369214575),
+                                    ("dd/mmat <time-of-day>", -3.8155121050473024),
+                                    ("hourhour", -3.4790398684260895),
+                                    ("dayyear", -3.3455084758015667),
+                                    ("named-daythis <time>", -2.5917366734251868),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.394449154672439),
-                                    ("minutemonth", -4.394449154672439),
-                                    ("named-monthyear", -3.883623530906448),
+                                     -4.326337728813293),
+                                    ("minutemonth", -4.326337728813293),
+                                    ("named-monthyear", -3.8155121050473024),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.394449154672439),
+                                     -4.326337728813293),
                                     ("absorption of , after named daynamed-month",
-                                     -3.7013019741124937),
+                                     -3.6331905482533475),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.394449154672439),
+                                     -4.326337728813293),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.394449154672439),
+                                     -4.326337728813293),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.799914262780603),
-                                    ("until <time-of-day>on <date>", -4.799914262780603),
-                                    ("dayminute", -3.4136199016607125),
-                                    ("minuteday", -3.295836866004329),
+                                     -4.7318028369214575),
+                                    ("until <time-of-day>on <date>", -4.7318028369214575),
+                                    ("dayminute", -3.3455084758015667),
+                                    ("minuteday", -3.2277254401451834),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.799914262780603),
-                                    ("named-dayat <time-of-day>", -3.883623530906448),
-                                    ("hh:mmon <date>", -3.4136199016607125),
+                                     -4.7318028369214575),
+                                    ("named-dayat <time-of-day>", -3.8155121050473024),
+                                    ("hh:mmon <date>", -3.3455084758015667),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.799914262780603),
+                                     -4.7318028369214575),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -3.883623530906448),
+                                     -3.8155121050473024),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -3.883623530906448),
-                                    ("this <part-of-day>until <time-of-day>", -4.394449154672439),
+                                     -3.8155121050473024),
+                                    ("this <part-of-day>until <time-of-day>", -4.326337728813293),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.394449154672439),
-                                    ("tomorrownoon", -4.799914262780603),
-                                    ("this <time>until <time-of-day>", -4.394449154672439),
-                                    ("minuteyear", -4.394449154672439),
-                                    ("yearminute", -4.394449154672439)],
-                               n = 81}}),
+                                     -4.326337728813293),
+                                    ("tomorrownoon", -4.7318028369214575),
+                                    ("this <time>until <time-of-day>", -4.326337728813293),
+                                    ("minuteyear", -4.326337728813293),
+                                    ("yearminute", -4.326337728813293)],
+                               n = 75}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.9924301646902063),
-                                    ("ordinals (first..31st)week (grain)intersect2",
-                                     -1.9924301646902063),
+                                   [("daymonth", -1.7346010553881064),
                                     ("ordinals (first..31st)week (grain)intersect",
-                                     -1.9924301646902063),
+                                     -1.7346010553881064),
                                     ("ordinals (first..31st)week (grain)named-month",
-                                     -1.9924301646902063),
-                                    ("weekmonth", -1.1451323043030026),
+                                     -1.7346010553881064),
+                                    ("weekmonth", -1.2237754316221157),
                                     ("ordinals (first..31st)day (grain)named-month",
-                                     -1.9924301646902063)],
-                               n = 8},
+                                     -1.7346010553881064)],
+                               n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("season",
         Classifier{okData =
@@ -570,31 +417,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("from <datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.2237754316221157,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -1.0296194171811581,
+                               unseen = -3.0910424533583156,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.4816045409242156),
+                                   [("minuteminute", -1.4350845252893227),
                                     ("time-of-day (latent)time-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
-                                    ("hourhour", -2.3978952727983707)],
+                                     -2.3513752571634776),
+                                    ("hh:mmhh:mm", -1.4350845252893227),
+                                    ("hourhour", -2.3513752571634776)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.3483066942682157,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -0.4418327522790392,
+                               unseen = -3.4011973816621555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.890371757896165),
-                                    ("hh:mmtime-of-day (latent)", -1.9740810260220096),
-                                    ("minuteminute", -1.6376087894007967),
-                                    ("yearyear", -2.890371757896165),
-                                    ("year (latent)year (latent)", -2.890371757896165),
-                                    ("minutehour", -1.9740810260220096),
-                                    ("hh:mmintersect", -2.1972245773362196),
-                                    ("year (latent)time-of-day (latent)", -2.890371757896165),
-                                    ("hh:mmintersect2", -2.1972245773362196)],
-                               n = 12}}),
+                                   [("yearhour", -2.6741486494265287),
+                                    ("hh:mmtime-of-day (latent)", -1.7578579175523736),
+                                    ("minuteminute", -1.9810014688665833),
+                                    ("yearyear", -2.6741486494265287),
+                                    ("year (latent)year (latent)", -2.6741486494265287),
+                                    ("minutehour", -1.7578579175523736),
+                                    ("hh:mmintersect", -1.9810014688665833),
+                                    ("year (latent)time-of-day (latent)", -2.6741486494265287)],
+                               n = 9}}),
        ("next <cycle>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.044522437723423,
@@ -727,25 +573,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.35667494393873245,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -0.5596157879354228, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.7576857016975165),
-                                    ("ordinals (first..31st)named-dayintersect2",
-                                     -1.5198257537444133),
+                                   [("daymonth", -0.7472144018302211),
                                     ("ordinals (first..31st)named-dayintersect",
-                                     -1.5198257537444133),
+                                     -0.9985288301111273),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -2.367123614131617)],
-                               n = 14},
+                                     -1.845826690498331)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -1.2039728043259361, unseen = -2.833213344056216,
+                     ClassData{prior = -0.8472978603872037, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.8266785731844679),
+                                   [("daymonth", -0.7621400520468967),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -0.8266785731844679)],
+                                     -0.7621400520468967)],
                                n = 6}}),
        ("the <day-of-month> (non ordinal)",
         Classifier{okData =
@@ -1005,16 +848,15 @@ classifiers
                                n = 4}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.044522437723423,
+                     ClassData{prior = 0.0, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.3862943611198906),
-                                    ("daymonth", -0.7985076962177716),
-                                    ("named-dayintersect", -1.8971199848858813),
-                                    ("named-dayintersect2", -1.8971199848858813)],
-                               n = 8},
+                                   [("named-daynamed-month", -1.0986122886681098),
+                                    ("daymonth", -0.7621400520468967),
+                                    ("named-dayintersect", -1.6094379124341003)],
+                               n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
@@ -1111,58 +953,47 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\"",
         Classifier{okData =
-                     ClassData{prior = -0.12062798778861475,
-                               unseen = -4.736198448394496,
+                     ClassData{prior = -0.1590646946296874, unseen = -4.442651256490317,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersectintersect2", -4.034240638152395),
-                                    ("at <time-of-day>named-day", -4.034240638152395),
-                                    ("intersect by \",\"year", -4.034240638152395),
-                                    ("at <time-of-day>intersect2", -4.034240638152395),
-                                    ("hh:mmintersect by \",\"", -4.034240638152395),
-                                    ("dayday", -2.32949254591397),
-                                    ("hh:mmnamed-day", -4.034240638152395),
-                                    ("intersect2intersect2", -4.034240638152395),
-                                    ("named-dayintersect by \",\"", -3.34109345759245),
-                                    ("dayyear", -2.9356283494842854),
+                                   [("at <time-of-day>named-day", -3.7376696182833684),
+                                    ("intersect by \",\"year", -3.7376696182833684),
+                                    ("hh:mmintersect by \",\"", -3.7376696182833684),
+                                    ("dayday", -2.032921526044943),
+                                    ("hh:mmnamed-day", -3.7376696182833684),
+                                    ("named-dayintersect by \",\"", -3.332204510175204),
+                                    ("dayyear", -2.8213788864092133),
                                     ("<named-month> <day-of-month> (non ordinal)intersect",
-                                     -4.034240638152395),
-                                    ("<named-month> <day-of-month> (non ordinal)intersect2",
-                                     -4.034240638152395),
+                                     -3.7376696182833684),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -3.628775530044231),
+                                     -3.332204510175204),
                                     ("<named-month> <day-of-month> (non ordinal)named-day",
-                                     -4.034240638152395),
+                                     -3.7376696182833684),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -3.34109345759245),
+                                     -3.044522437723423),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -2.9356283494842854),
-                                    ("hh:mmintersect", -4.034240638152395),
-                                    ("intersect by \",\"intersect", -4.034240638152395),
-                                    ("named-dayintersect", -4.034240638152395),
-                                    ("at <time-of-day>intersect", -4.034240638152395),
-                                    ("dayminute", -2.1624384612508036),
-                                    ("intersect2intersect", -4.034240638152395),
-                                    ("intersectyear", -4.034240638152395),
-                                    ("minuteday", -2.1624384612508036),
-                                    ("hh:mmintersect2", -4.034240638152395),
-                                    ("hh:mmabsorption of , after named day", -4.034240638152395),
-                                    ("named-dayintersect2", -4.034240638152395),
-                                    ("intersect by \",\"intersect2", -4.034240638152395),
-                                    ("at <time-of-day>intersect by \",\"", -4.034240638152395),
+                                     -2.639057329615259),
+                                    ("hh:mmintersect", -3.7376696182833684),
+                                    ("intersect by \",\"intersect", -3.7376696182833684),
+                                    ("named-dayintersect", -3.7376696182833684),
+                                    ("at <time-of-day>intersect", -3.7376696182833684),
+                                    ("dayminute", -2.639057329615259),
+                                    ("intersectyear", -3.7376696182833684),
+                                    ("minuteday", -2.032921526044943),
+                                    ("hh:mmabsorption of , after named day", -3.7376696182833684),
+                                    ("at <time-of-day>intersect by \",\"", -3.7376696182833684),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -4.034240638152395),
-                                    ("intersectintersect", -4.034240638152395),
-                                    ("intersect2year", -4.034240638152395),
+                                     -3.7376696182833684),
+                                    ("intersectintersect", -3.7376696182833684),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -3.628775530044231)],
-                               n = 39},
+                                     -3.332204510175204)],
+                               n = 29},
                    koData =
-                     ClassData{prior = -2.174751721484161, unseen = -3.828641396489095,
+                     ClassData{prior = -1.916922612182061, unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -2.0149030205422647),
-                                    ("daymonth", -2.0149030205422647)],
+                                   [("named-daynamed-month", -1.791759469228055),
+                                    ("daymonth", -1.791759469228055)],
                                n = 5}}),
        ("hh:mm",
         Classifier{okData =
@@ -1211,28 +1042,26 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.9315582040049435,
-                               unseen = -3.5553480614894135,
+                     ClassData{prior = -0.8209805520698302,
+                               unseen = -3.4011973816621555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.916922612182061),
-                                    ("daymonth", -1.329135947279942),
-                                    ("named-daylast <cycle>", -2.833213344056216),
-                                    ("named-daynext <cycle>", -2.833213344056216),
-                                    ("named-dayintersect", -2.4277482359480516),
-                                    ("named-dayintersect2", -2.4277482359480516),
-                                    ("dayweek", -1.7346010553881064),
-                                    ("named-daythis <cycle>", -2.1400661634962708)],
-                               n = 13},
+                                   [("named-daynamed-month", -1.7578579175523736),
+                                    ("daymonth", -1.4213856809311607),
+                                    ("named-daylast <cycle>", -2.6741486494265287),
+                                    ("named-daynext <cycle>", -2.6741486494265287),
+                                    ("named-dayintersect", -2.268683541318364),
+                                    ("dayweek", -1.575536360758419),
+                                    ("named-daythis <cycle>", -1.9810014688665833)],
+                               n = 11},
                    koData =
-                     ClassData{prior = -0.5007752879124893, unseen = -3.891820298110627,
+                     ClassData{prior = -0.579818495252942, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.6739764335716716),
-                                    ("daymonth", -0.8266785731844679),
-                                    ("named-dayintersect", -1.9252908618525775),
-                                    ("named-dayintersect2", -1.9252908618525775)],
-                               n = 20}}),
+                                   [("named-daynamed-month", -1.3581234841531944),
+                                    ("daymonth", -0.8472978603872037),
+                                    ("named-dayintersect", -1.6094379124341003)],
+                               n = 14}}),
        ("<duration> ago",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.5553480614894135,
@@ -1285,22 +1114,22 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("until <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.35667494393873245,
-                               unseen = -3.044522437723423,
+                     ClassData{prior = -0.25131442828090605,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>", -0.916290731874155),
-                                    ("hour", -0.916290731874155)],
+                                   [("at <time-of-day>", -0.8649974374866046),
+                                    ("hour", -0.8649974374866046)],
                                n = 7},
                    koData =
-                     ClassData{prior = -1.2039728043259361,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.5040773967762742,
+                               unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -1.791759469228055),
-                                    ("intersect", -1.791759469228055),
-                                    ("hh:mm", -1.791759469228055), ("minute", -1.0986122886681098)],
-                               n = 3}}),
+                                   [("intersect", -1.5040773967762742),
+                                    ("hh:mm", -1.5040773967762742),
+                                    ("minute", -1.0986122886681098)],
+                               n = 2}}),
        ("<integer> and an half hours",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -1440,36 +1269,34 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.7985076962177716,
-                               unseen = -3.9318256327243257,
+                     ClassData{prior = -0.6649763035932491, unseen = -3.912023005428146,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2729656758128873),
-                                    ("hh:mmhh:mm", -1.2729656758128873),
-                                    ("dayday", -2.120263536200091),
+                                   [("minuteminute", -1.252762968495368),
+                                    ("hh:mmhh:mm", -1.252762968495368),
+                                    ("dayday", -2.1000608288825715),
                                     ("<day-of-month> (non ordinal) <named-month><day-of-month> (non ordinal) <named-month>",
-                                     -2.120263536200091)],
+                                     -2.1000608288825715)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.5978370007556204, unseen = -4.07753744390572,
+                     ClassData{prior = -0.7221347174331976, unseen = -3.871201010907891,
                                likelihoods =
                                  HashMap.fromList
-                                   [("monthday", -2.268683541318364),
-                                    ("minuteminute", -1.575536360758419),
-                                    ("hh:mmhh:mm", -3.367295829986474),
-                                    ("dayyear", -2.9618307218783095),
+                                   [("monthday", -2.0583881324820035),
+                                    ("minuteminute", -1.9042374526547454),
+                                    ("hh:mmhh:mm", -3.1570004211501135),
+                                    ("dayyear", -2.751535313041949),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -2.9618307218783095),
-                                    ("hh:mmintersect", -2.268683541318364),
-                                    ("hh:mmintersect2", -2.268683541318364),
-                                    ("dd/mmyear", -2.9618307218783095),
+                                     -2.751535313041949),
+                                    ("hh:mmintersect", -2.0583881324820035),
+                                    ("dd/mmyear", -2.751535313041949),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -2.268683541318364),
+                                     -2.0583881324820035),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -2.9618307218783095),
-                                    ("minuteyear", -2.9618307218783095),
-                                    ("yearminute", -2.9618307218783095)],
-                               n = 22}}),
+                                     -2.751535313041949),
+                                    ("minuteyear", -2.751535313041949),
+                                    ("yearminute", -2.751535313041949)],
+                               n = 17}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
                      ClassData{prior = -0.7672551527136672,
@@ -1596,20 +1423,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("last <cycle> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4965075614664802,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.5198257537444133),
-                                    ("week (grain)named-month", -2.367123614131617),
-                                    ("day (grain)intersect", -2.367123614131617),
-                                    ("day (grain)intersect2", -2.367123614131617),
-                                    ("weekmonth", -1.5198257537444133),
-                                    ("day (grain)named-month", -2.367123614131617),
-                                    ("week (grain)intersect", -2.367123614131617),
-                                    ("week (grain)intersect2", -2.367123614131617)],
-                               n = 12},
+                                   [("daymonth", -1.4816045409242156),
+                                    ("week (grain)named-month", -1.9924301646902063),
+                                    ("day (grain)intersect", -1.9924301646902063),
+                                    ("weekmonth", -1.4816045409242156),
+                                    ("day (grain)named-month", -1.9924301646902063),
+                                    ("week (grain)intersect", -1.9924301646902063)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month>(ordinal) <named-month> year",
         Classifier{okData =
@@ -1641,27 +1466,25 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("after <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.6418538861723948,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -0.7537718023763802, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.367123614131617),
-                                    ("at <time-of-day>", -1.8562979903656263),
-                                    ("intersect", -2.367123614131617),
-                                    ("tomorrow", -2.367123614131617), ("day", -2.367123614131617),
-                                    ("hour", -1.2685113254635072)],
-                               n = 10},
+                                   [("at <time-of-day>", -1.6863989535702288),
+                                    ("intersect", -2.1972245773362196),
+                                    ("tomorrow", -2.1972245773362196), ("day", -2.1972245773362196),
+                                    ("hour", -1.349926716949016)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.7472144018302211,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6359887667199967,
+                               unseen = -3.4011973816621555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this <part-of-day>", -2.3025850929940455),
-                                    ("christmas eve", -2.3025850929940455),
-                                    ("in|during the <part-of-day>", -2.3025850929940455),
-                                    ("day", -2.3025850929940455), ("hh:mm", -2.70805020110221),
-                                    ("hour", -1.455287232606842), ("minute", -2.70805020110221),
-                                    ("this <time>", -2.3025850929940455)],
+                                   [("this <part-of-day>", -2.268683541318364),
+                                    ("christmas eve", -2.268683541318364),
+                                    ("in|during the <part-of-day>", -2.268683541318364),
+                                    ("day", -2.268683541318364), ("hh:mm", -2.6741486494265287),
+                                    ("hour", -1.4213856809311607), ("minute", -2.6741486494265287),
+                                    ("this <time>", -2.268683541318364)],
                                n = 9}}),
        ("day (grain)",
         Classifier{okData =
@@ -1706,33 +1529,30 @@ classifiers
                                n = 10}}),
        ("this <time>",
         Classifier{okData =
-                     ClassData{prior = -1.413693335308005, unseen = -3.9318256327243257,
+                     ClassData{prior = -1.3217558399823195, unseen = -3.828641396489095,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.3025850929940455),
-                                    ("intersect2", -2.8134107167600364),
-                                    ("intersect", -2.8134107167600364),
-                                    ("season", -2.3025850929940455),
-                                    ("next <cycle>", -3.2188758248682006),
-                                    ("named-month", -2.8134107167600364),
-                                    ("day", -2.3025850929940455),
-                                    ("this <cycle>", -2.5257286443082556),
-                                    ("hour", -2.3025850929940455), ("evening", -3.2188758248682006),
-                                    ("month", -1.9661128563728327),
-                                    ("morning", -3.2188758248682006),
-                                    ("week-end", -2.8134107167600364)],
-                               n = 18},
+                                   [("week", -2.1972245773362196), ("intersect", -2.70805020110221),
+                                    ("season", -2.1972245773362196),
+                                    ("next <cycle>", -3.1135153092103742),
+                                    ("named-month", -2.70805020110221),
+                                    ("day", -2.1972245773362196),
+                                    ("this <cycle>", -2.4203681286504293),
+                                    ("hour", -2.1972245773362196), ("evening", -3.1135153092103742),
+                                    ("month", -2.1972245773362196),
+                                    ("morning", -3.1135153092103742),
+                                    ("week-end", -2.70805020110221)],
+                               n = 16},
                    koData =
-                     ClassData{prior = -0.2787134024690205, unseen = -4.844187086458591,
+                     ClassData{prior = -0.3101549283038396, unseen = -4.624972813284271,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.2713325494899412),
-                                    ("intersect", -2.2713325494899412),
-                                    ("named-month", -1.8918429277850375),
-                                    ("time-of-day (latent)", -3.7376696182833684),
-                                    ("hour", -2.128231705849268), ("month", -1.0750817912579156),
-                                    ("morning", -2.2713325494899412)],
-                               n = 56}}),
+                                   [("intersect", -2.0501711593797225),
+                                    ("named-month", -1.670681537674819),
+                                    ("time-of-day (latent)", -3.5165082281731497),
+                                    ("hour", -1.9070703157390494), ("month", -1.1811333123561132),
+                                    ("morning", -2.0501711593797225)],
+                               n = 44}}),
        ("within <duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
diff --git a/Duckling/Ranking/Classifiers/EN.hs b/Duckling/Ranking/Classifiers/EN.hs
index dd805928..9311352f 100644
--- a/Duckling/Ranking/Classifiers/EN.hs
+++ b/Duckling/Ranking/Classifiers/EN.hs
@@ -107,23 +107,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<cycle> after|before <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8109302162163288, unseen = -2.833213344056216,
+                     ClassData{prior = -0.5596157879354228, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("day (grain)tomorrow", -1.6739764335716716),
-                                    ("dayday", -1.1631508098056809),
-                                    ("day (grain)yesterday", -1.6739764335716716)],
+                                   [("day (grain)tomorrow", -1.6094379124341003),
+                                    ("dayday", -1.0986122886681098),
+                                    ("day (grain)yesterday", -1.6094379124341003)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.587786664902119, unseen = -2.9444389791664407,
+                     ClassData{prior = -0.8472978603872037, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.2809338454620642),
-                                    ("year (grain)Christmas", -2.1972245773362196),
-                                    ("day (grain)intersect", -1.791759469228055),
-                                    ("day (grain)intersect2", -1.791759469228055),
-                                    ("yearday", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("dayhour", -1.466337068793427),
+                                    ("year (grain)Christmas", -1.8718021769015913),
+                                    ("day (grain)intersect", -1.466337068793427),
+                                    ("yearday", -1.8718021769015913)],
+                               n = 3}}),
        ("Martin Luther King's Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
@@ -150,230 +149,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("intersect2",
-        Classifier{okData =
-                     ClassData{prior = -0.47457431954056717,
-                               unseen = -6.236369590203704,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.624972813284271),
-                                    ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.624972813284271),
-                                    ("hourday", -3.836515452920001),
-                                    ("dayhour", -3.2386784521643803),
-                                    ("daymonth", -5.541263545158426),
-                                    ("monthday", -5.135798437050262),
-                                    ("monthyear", -3.9318256327243257),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.541263545158426),
-                                    ("Christmasyear", -5.541263545158426),
-                                    ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -5.541263545158426),
-                                    ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.848116364598481),
-                                    ("<time-of-day> am|pmintersect", -4.288500576663058),
-                                    ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -5.541263545158426),
-                                    ("Marchyear", -5.541263545158426),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year",
-                                     -5.135798437050262),
-                                    ("intersect<time-of-day> am|pm", -5.541263545158426),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.541263545158426),
-                                    ("monthhour", -4.848116364598481),
-                                    ("last <day-of-week> of <time>year", -5.541263545158426),
-                                    ("intersect2<time-of-day> am|pm", -5.541263545158426),
-                                    ("todayat <time-of-day>", -5.541263545158426),
-                                    ("Thursday<time> timezone", -5.135798437050262),
-                                    ("at <time-of-day>intersect2", -5.135798437050262),
-                                    ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -5.541263545158426),
-                                    ("dayday", -3.5263605246161616),
-                                    ("Thanksgiving Dayyear", -5.135798437050262),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.541263545158426),
-                                    ("Tuesdayin <named-month>", -5.541263545158426),
-                                    ("mm/ddat <time-of-day>", -5.541263545158426),
-                                    ("tonightat <time-of-day>", -5.541263545158426),
-                                    ("<time-of-day> am|pmabsorption of , after named day",
-                                     -4.848116364598481),
-                                    ("today<time-of-day> am|pm", -5.541263545158426),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.135798437050262),
-                                    ("at <time-of-day><time> <part-of-day>", -5.541263545158426),
-                                    ("mm/dd<time-of-day> am|pm", -5.541263545158426),
-                                    ("hourhour", -4.288500576663058),
-                                    ("<time-of-day> am|pmon <date>", -3.3440389678222067),
-                                    ("absorption of , after named dayintersect2",
-                                     -5.541263545158426),
-                                    ("Wednesdaythis|last|next <cycle>", -5.541263545158426),
-                                    ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.037186148382152),
-                                    ("dayyear", -3.3440389678222067),
-                                    ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -5.541263545158426),
-                                    ("<time-of-day> am|pmtomorrow", -4.848116364598481),
-                                    ("intersect2in|during the <part-of-day>", -5.541263545158426),
-                                    ("minutehour", -4.624972813284271),
-                                    ("Mother's Dayyear", -5.541263545158426),
-                                    ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.135798437050262),
-                                    ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -3.836515452920001),
-                                    ("tomorrow<time-of-day> sharp|exactly", -5.541263545158426),
-                                    ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.624972813284271),
-                                    ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.135798437050262),
-                                    ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.624972813284271),
-                                    ("Mondayin|during the <part-of-day>", -5.541263545158426),
-                                    ("intersect2<named-month> <day-of-month> (non ordinal)",
-                                     -4.037186148382152),
-                                    ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.135798437050262),
-                                    ("intersectin|during the <part-of-day>", -5.541263545158426),
-                                    ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -5.541263545158426),
-                                    ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.848116364598481),
-                                    ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -4.442651256490317),
-                                    ("at <time-of-day>intersect", -5.135798437050262),
-                                    ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -5.541263545158426),
-                                    ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.541263545158426),
-                                    ("dayminute", -3.056356895370426),
-                                    ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.135798437050262),
-                                    ("<datetime> - <datetime> (interval)tomorrow",
-                                     -5.541263545158426),
-                                    ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.848116364598481),
-                                    ("<ordinal> <cycle> of <time>year", -5.541263545158426),
-                                    ("minuteday", -1.8523840910444898),
-                                    ("absorption of , after named dayintersect",
-                                     -5.541263545158426),
-                                    ("Octoberyear", -4.288500576663058),
-                                    ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -5.541263545158426),
-                                    ("at <time-of-day>absorption of , after named day",
-                                     -5.541263545158426),
-                                    ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -5.541263545158426),
-                                    ("year<time-of-day> am|pm", -5.541263545158426),
-                                    ("Septemberyear", -5.135798437050262),
-                                    ("at <time-of-day>on <date>", -4.288500576663058),
-                                    ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.848116364598481),
-                                    ("<time-of-day> am|pmintersect2", -4.288500576663058),
-                                    ("Halloweenyear", -5.541263545158426),
-                                    ("dayweek", -5.541263545158426),
-                                    ("weekyear", -5.135798437050262),
-                                    ("hh:mmin|during the <part-of-day>", -4.848116364598481),
-                                    ("Father's Dayyear", -5.541263545158426),
-                                    ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.135798437050262),
-                                    ("February<time> <part-of-day>", -5.541263545158426),
-                                    ("Martin Luther King's Dayyear", -5.135798437050262),
-                                    ("Februaryintersect2", -5.541263545158426),
-                                    ("tomorrowat <time-of-day>", -4.848116364598481),
-                                    ("between <time> and <time>on <date>", -4.848116364598481),
-                                    ("at <time-of-day>tomorrow", -5.135798437050262),
-                                    ("tomorrow<time-of-day> am|pm", -5.541263545158426),
-                                    ("in|during the <part-of-day>at <time-of-day>",
-                                     -5.541263545158426),
-                                    ("Labor Dayyear", -5.541263545158426),
-                                    ("Februaryintersect", -5.541263545158426),
-                                    ("last <cycle> of <time>year", -4.848116364598481),
-                                    ("<named-month> <day-of-month> (non ordinal)year",
-                                     -5.541263545158426),
-                                    ("yearminute", -5.541263545158426)],
-                               n = 191},
-                   koData =
-                     ClassData{prior = -0.9732575564808325,
-                               unseen = -5.8888779583328805,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("in <named-month>year", -5.19295685089021),
-                                    ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.19295685089021),
-                                    ("hourday", -5.19295685089021),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.19295685089021),
-                                    ("dayhour", -3.4011973816621555),
-                                    ("daymonth", -3.1780538303479458),
-                                    ("monthday", -4.787491742782046),
-                                    ("monthyear", -4.787491742782046),
-                                    ("intersecthh:mm", -5.19295685089021),
-                                    ("until <time-of-day><time-of-day> am|pm", -5.19295685089021),
-                                    ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
-                                    ("<time-of-day> am|pmintersect", -3.9401938823948424),
-                                    ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -4.499809670330265),
-                                    ("Tuesdayafter <time-of-day>", -5.19295685089021),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.19295685089021),
-                                    ("intersect2hh:mm", -5.19295685089021),
-                                    ("absorption of , after named dayJuly", -4.787491742782046),
-                                    ("monthhour", -4.787491742782046),
-                                    ("todayat <time-of-day>", -5.19295685089021),
-                                    ("at <time-of-day>intersect2", -4.787491742782046),
-                                    ("dayday", -5.19295685089021),
-                                    ("mm/ddat <time-of-day>", -4.787491742782046),
-                                    ("<time-of-day> am|pmon <date>", -3.58351893845611),
-                                    ("absorption of , after named dayintersect2",
-                                     -5.19295685089021),
-                                    ("dayyear", -4.276666119016055),
-                                    ("Thursdayat <time-of-day>", -5.19295685089021),
-                                    ("August<time-of-day> am|pm", -5.19295685089021),
-                                    ("monthminute", -5.19295685089021),
-                                    ("<time-of-day> am|pmtomorrow", -5.19295685089021),
-                                    ("Thursdayhh:mm", -5.19295685089021),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.19295685089021),
-                                    ("minutemonth", -3.0528906873939397),
-                                    ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.787491742782046),
-                                    ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.787491742782046),
-                                    ("Aprilyear", -5.19295685089021),
-                                    ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -4.787491742782046),
-                                    ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.19295685089021),
-                                    ("yesterday<time-of-day> am|pm", -5.19295685089021),
-                                    ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -4.0943445622221),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.19295685089021),
-                                    ("until <time-of-day>on <date>", -4.499809670330265),
-                                    ("at <time-of-day>intersect", -4.787491742782046),
-                                    ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.19295685089021),
-                                    ("dayminute", -2.995732273553991),
-                                    ("intersectSeptember", -3.6888794541139363),
-                                    ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.787491742782046),
-                                    ("minuteday", -2.0794415416798357),
-                                    ("absorption of , after named dayintersect", -5.19295685089021),
-                                    ("Februaryin|during the <part-of-day>", -5.19295685089021),
-                                    ("yearhh:mm", -5.19295685089021),
-                                    ("hh:mmon <date>", -3.6888794541139363),
-                                    ("intersect2September", -3.6888794541139363),
-                                    ("absorption of , after named daySeptember",
-                                     -4.276666119016055),
-                                    ("on <date>September", -4.787491742782046),
-                                    ("at <time-of-day>on <date>", -4.499809670330265),
-                                    ("<time-of-day> am|pmintersect2", -3.9401938823948424),
-                                    ("absorption of , after named dayFebruary", -4.276666119016055),
-                                    ("July<integer> to|till|before <hour-of-day>",
-                                     -5.19295685089021),
-                                    ("tomorrowat <time-of-day>", -5.19295685089021),
-                                    ("tomorrow<time-of-day> am|pm", -5.19295685089021),
-                                    ("after <time-of-day><time-of-day> am|pm", -5.19295685089021),
-                                    ("after <time-of-day>year", -5.19295685089021),
-                                    ("yearminute", -5.19295685089021)],
-                               n = 116}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -2.3978952727983707,
@@ -395,53 +170,52 @@ classifiers
                                n = 3}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -9.844007281325252e-2,
-                               unseen = -4.454347296253507,
+                     ClassData{prior = -0.10536051565782628,
+                               unseen = -4.382026634673881,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.7495040759303713),
-                                    ("dayhour", -1.6094379124341003),
-                                    ("Mondayearly morning", -3.3440389678222067),
-                                    ("time-of-day (latent)tonight", -3.3440389678222067),
-                                    ("hourhour", -2.245426679154097),
+                                     -3.676300671907076),
+                                    ("dayhour", -1.5968591302272404),
+                                    ("Mondayearly morning", -3.270835563798912),
+                                    ("time-of-day (latent)tonight", -3.270835563798912),
+                                    ("hourhour", -2.2900063107871858),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.7495040759303713),
-                                    ("todaypart of days", -3.7495040759303713),
-                                    ("intersect2part of days", -3.7495040759303713),
-                                    ("intersect2in|during the <part-of-day>", -3.7495040759303713),
-                                    ("minutehour", -2.6508917872622613),
+                                     -3.676300671907076),
+                                    ("todaypart of days", -3.676300671907076),
+                                    ("minutehour", -2.5776883832389665),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.3440389678222067),
-                                    ("time-of-day (latent)this <part-of-day>", -3.7495040759303713),
-                                    ("Mondayin|during the <part-of-day>", -3.7495040759303713),
-                                    ("intersectpart of days", -3.7495040759303713),
-                                    ("intersectin|during the <part-of-day>", -3.7495040759303713),
+                                     -3.270835563798912),
+                                    ("time-of-day (latent)this <part-of-day>", -3.676300671907076),
+                                    ("Mondayin|during the <part-of-day>", -3.676300671907076),
+                                    ("intersectpart of days", -3.676300671907076),
+                                    ("intersectin|during the <part-of-day>", -3.676300671907076),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.7495040759303713),
+                                     -3.676300671907076),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.7495040759303713),
-                                    ("tomorrowpart of days", -2.6508917872622613),
-                                    ("hh:mmin|during the <part-of-day>", -3.056356895370426),
+                                     -3.676300671907076),
+                                    ("tomorrowpart of days", -2.5776883832389665),
+                                    ("hh:mmin|during the <part-of-day>", -2.9831534913471307),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.7495040759303713),
+                                     -3.676300671907076),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.7495040759303713),
-                                    ("yesterdaypart of days", -3.7495040759303713),
-                                    ("Mondaypart of days", -3.7495040759303713)],
-                               n = 29},
+                                     -3.676300671907076),
+                                    ("yesterdaypart of days", -3.676300671907076),
+                                    ("Mondaypart of days", -3.676300671907076)],
+                               n = 27},
                    koData =
-                     ClassData{prior = -2.367123614131617, unseen = -3.5263605246161616,
+                     ClassData{prior = -2.3025850929940455,
+                               unseen = -3.4657359027997265,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.803360380906535),
-                                    ("monthhour", -2.803360380906535),
-                                    ("hourhour", -2.803360380906535),
+                                   [("yearhour", -2.740840023925201),
+                                    ("monthhour", -2.740840023925201),
+                                    ("hourhour", -2.740840023925201),
                                     ("past year (latent)in|during the <part-of-day>",
-                                     -2.803360380906535),
-                                    ("Februaryin|during the <part-of-day>", -2.803360380906535),
+                                     -2.740840023925201),
+                                    ("Februaryin|during the <part-of-day>", -2.740840023925201),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.803360380906535)],
+                                     -2.740840023925201)],
                                n = 3}}),
        ("today",
         Classifier{okData =
@@ -525,31 +299,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <date>",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -4.0943445622221,
+                     ClassData{prior = -0.1670540846631662, unseen = -4.007333185232471,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.8803128665695),
-                                    ("intersect2", -2.9789251552376097),
-                                    ("mm/dd", -3.3843902633457743),
-                                    ("absorption of , after named day", -2.9789251552376097),
-                                    ("intersect", -2.9789251552376097),
-                                    ("Saturday", -2.691243082785829),
-                                    ("Friday", -3.3843902633457743), ("day", -0.8994836135577737),
-                                    ("the <day-of-month> (ordinal)", -2.9789251552376097),
+                                   [("Thursday", -1.791759469228055), ("mm/dd", -3.295836866004329),
+                                    ("absorption of , after named day", -2.890371757896165),
+                                    ("intersect", -2.890371757896165),
+                                    ("Saturday", -2.6026896854443837),
+                                    ("Friday", -3.295836866004329), ("day", -0.8979415932059586),
+                                    ("the <day-of-month> (ordinal)", -2.890371757896165),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.691243082785829),
-                                    ("hour", -3.3843902633457743)],
-                               n = 24},
+                                     -2.6026896854443837),
+                                    ("hour", -3.295836866004329)],
+                               n = 22},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = -1.8718021769015913,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.03688192726104),
-                                    ("intersect", -2.03688192726104), ("day", -1.1895840668738362),
+                                   [("intersect", -1.791759469228055), ("day", -1.2809338454620642),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.03688192726104)],
-                               n = 6}}),
+                                     -1.791759469228055)],
+                               n = 4}}),
        ("integer (0..19)",
         Classifier{okData =
                      ClassData{prior = -2.7398974188114388e-2,
@@ -736,228 +507,213 @@ classifiers
                                n = 1}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47457431954056717,
-                               unseen = -6.236369590203704,
+                     ClassData{prior = -0.44313061099463913,
+                               unseen = -6.1092475827643655,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.624972813284271),
+                                     -4.497584975308154),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.624972813284271),
-                                    ("hourday", -3.836515452920001),
-                                    ("dayhour", -3.2386784521643803),
-                                    ("daymonth", -5.541263545158426),
-                                    ("monthday", -5.135798437050262),
-                                    ("monthyear", -3.9318256327243257),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.541263545158426),
-                                    ("Christmasyear", -5.541263545158426),
+                                     -4.497584975308154),
+                                    ("hourday", -3.709127614943884),
+                                    ("dayhour", -3.162583908575814),
+                                    ("daymonth", -5.413875707182309),
+                                    ("monthday", -5.0084105990741445),
+                                    ("monthyear", -3.8044377947482086),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.413875707182309),
+                                    ("Christmasyear", -5.413875707182309),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -5.541263545158426),
+                                     -5.413875707182309),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.848116364598481),
-                                    ("<time-of-day> am|pmintersect", -4.288500576663058),
+                                     -4.720728526622364),
+                                    ("<time-of-day> am|pmintersect", -4.161112738686941),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -5.541263545158426),
-                                    ("Marchyear", -5.541263545158426),
+                                     -5.413875707182309),
+                                    ("Marchyear", -5.413875707182309),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year",
-                                     -5.135798437050262),
-                                    ("intersect<time-of-day> am|pm", -5.541263545158426),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.541263545158426),
-                                    ("monthhour", -4.848116364598481),
-                                    ("last <day-of-week> of <time>year", -5.541263545158426),
-                                    ("intersect2<time-of-day> am|pm", -5.541263545158426),
-                                    ("todayat <time-of-day>", -5.541263545158426),
-                                    ("Thursday<time> timezone", -5.135798437050262),
-                                    ("at <time-of-day>intersect2", -5.135798437050262),
+                                     -5.0084105990741445),
+                                    ("intersect<time-of-day> am|pm", -5.413875707182309),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.413875707182309),
+                                    ("monthhour", -5.0084105990741445),
+                                    ("last <day-of-week> of <time>year", -5.413875707182309),
+                                    ("todayat <time-of-day>", -5.413875707182309),
+                                    ("Thursday<time> timezone", -5.0084105990741445),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -5.541263545158426),
-                                    ("dayday", -3.5263605246161616),
-                                    ("Thanksgiving Dayyear", -5.135798437050262),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.541263545158426),
-                                    ("Tuesdayin <named-month>", -5.541263545158426),
-                                    ("mm/ddat <time-of-day>", -5.541263545158426),
-                                    ("tonightat <time-of-day>", -5.541263545158426),
+                                     -5.413875707182309),
+                                    ("dayday", -3.398972686640044),
+                                    ("Thanksgiving Dayyear", -5.0084105990741445),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.413875707182309),
+                                    ("Tuesdayin <named-month>", -5.413875707182309),
+                                    ("mm/ddat <time-of-day>", -5.413875707182309),
+                                    ("tonightat <time-of-day>", -5.413875707182309),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -4.848116364598481),
-                                    ("today<time-of-day> am|pm", -5.541263545158426),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.135798437050262),
-                                    ("at <time-of-day><time> <part-of-day>", -5.541263545158426),
-                                    ("mm/dd<time-of-day> am|pm", -5.541263545158426),
-                                    ("hourhour", -4.288500576663058),
-                                    ("<time-of-day> am|pmon <date>", -3.3440389678222067),
-                                    ("absorption of , after named dayintersect2",
-                                     -5.541263545158426),
-                                    ("Wednesdaythis|last|next <cycle>", -5.541263545158426),
+                                     -4.720728526622364),
+                                    ("today<time-of-day> am|pm", -5.413875707182309),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.0084105990741445),
+                                    ("at <time-of-day><time> <part-of-day>", -5.413875707182309),
+                                    ("mm/dd<time-of-day> am|pm", -5.413875707182309),
+                                    ("hourhour", -4.161112738686941),
+                                    ("<time-of-day> am|pmon <date>", -3.398972686640044),
+                                    ("Wednesdaythis|last|next <cycle>", -5.413875707182309),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.037186148382152),
-                                    ("dayyear", -3.3440389678222067),
+                                     -3.909798310406035),
+                                    ("dayyear", -3.2166511298460896),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -5.541263545158426),
-                                    ("<time-of-day> am|pmtomorrow", -4.848116364598481),
-                                    ("intersect2in|during the <part-of-day>", -5.541263545158426),
-                                    ("minutehour", -4.624972813284271),
-                                    ("Mother's Dayyear", -5.541263545158426),
+                                     -5.413875707182309),
+                                    ("<time-of-day> am|pmtomorrow", -4.720728526622364),
+                                    ("minutehour", -4.497584975308154),
+                                    ("Mother's Dayyear", -5.413875707182309),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.135798437050262),
+                                     -5.0084105990741445),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -3.836515452920001),
-                                    ("tomorrow<time-of-day> sharp|exactly", -5.541263545158426),
+                                     -3.709127614943884),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.413875707182309),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.624972813284271),
+                                     -4.497584975308154),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.135798437050262),
+                                     -5.0084105990741445),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.624972813284271),
-                                    ("Mondayin|during the <part-of-day>", -5.541263545158426),
-                                    ("intersect2<named-month> <day-of-month> (non ordinal)",
-                                     -4.037186148382152),
+                                     -4.497584975308154),
+                                    ("Mondayin|during the <part-of-day>", -5.413875707182309),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.135798437050262),
-                                    ("intersectin|during the <part-of-day>", -5.541263545158426),
+                                     -5.0084105990741445),
+                                    ("intersectin|during the <part-of-day>", -5.413875707182309),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -5.541263545158426),
+                                     -5.413875707182309),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.848116364598481),
+                                     -4.720728526622364),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -4.442651256490317),
-                                    ("at <time-of-day>intersect", -5.135798437050262),
+                                     -4.497584975308154),
+                                    ("at <time-of-day>intersect", -5.0084105990741445),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -5.541263545158426),
+                                     -5.413875707182309),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.541263545158426),
-                                    ("dayminute", -3.056356895370426),
+                                     -5.413875707182309),
+                                    ("dayminute", -3.1112906141882632),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.135798437050262),
+                                     -5.0084105990741445),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -5.541263545158426),
+                                     -5.413875707182309),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.848116364598481),
-                                    ("<ordinal> <cycle> of <time>year", -5.541263545158426),
-                                    ("minuteday", -1.8523840910444898),
+                                     -5.0084105990741445),
+                                    ("<ordinal> <cycle> of <time>year", -5.413875707182309),
+                                    ("minuteday", -2.0126783255201537),
                                     ("absorption of , after named dayintersect",
-                                     -5.541263545158426),
-                                    ("Octoberyear", -4.288500576663058),
+                                     -5.413875707182309),
+                                    ("Octoberyear", -4.161112738686941),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -5.541263545158426),
+                                     -5.413875707182309),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -5.541263545158426),
+                                     -5.413875707182309),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -5.541263545158426),
-                                    ("year<time-of-day> am|pm", -5.541263545158426),
-                                    ("Septemberyear", -5.135798437050262),
-                                    ("at <time-of-day>on <date>", -4.288500576663058),
+                                     -5.413875707182309),
+                                    ("year<time-of-day> am|pm", -5.413875707182309),
+                                    ("Septemberyear", -5.0084105990741445),
+                                    ("at <time-of-day>on <date>", -4.315263418514199),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.848116364598481),
-                                    ("<time-of-day> am|pmintersect2", -4.288500576663058),
-                                    ("Halloweenyear", -5.541263545158426),
-                                    ("dayweek", -5.541263545158426),
-                                    ("weekyear", -5.135798437050262),
-                                    ("hh:mmin|during the <part-of-day>", -4.848116364598481),
-                                    ("Father's Dayyear", -5.541263545158426),
+                                     -4.720728526622364),
+                                    ("Halloweenyear", -5.413875707182309),
+                                    ("dayweek", -5.413875707182309),
+                                    ("weekyear", -5.0084105990741445),
+                                    ("hh:mmin|during the <part-of-day>", -4.720728526622364),
+                                    ("Father's Dayyear", -5.413875707182309),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.135798437050262),
-                                    ("February<time> <part-of-day>", -5.541263545158426),
-                                    ("Martin Luther King's Dayyear", -5.135798437050262),
-                                    ("Februaryintersect2", -5.541263545158426),
-                                    ("tomorrowat <time-of-day>", -4.848116364598481),
-                                    ("between <time> and <time>on <date>", -4.848116364598481),
-                                    ("at <time-of-day>tomorrow", -5.135798437050262),
-                                    ("tomorrow<time-of-day> am|pm", -5.541263545158426),
+                                     -5.0084105990741445),
+                                    ("February<time> <part-of-day>", -5.413875707182309),
+                                    ("Martin Luther King's Dayyear", -5.0084105990741445),
+                                    ("tomorrowat <time-of-day>", -4.720728526622364),
+                                    ("between <time> and <time>on <date>", -4.720728526622364),
+                                    ("at <time-of-day>tomorrow", -5.0084105990741445),
+                                    ("tomorrow<time-of-day> am|pm", -5.413875707182309),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -5.541263545158426),
-                                    ("Labor Dayyear", -5.541263545158426),
-                                    ("Februaryintersect", -5.541263545158426),
-                                    ("last <cycle> of <time>year", -4.848116364598481),
+                                     -5.413875707182309),
+                                    ("Labor Dayyear", -5.413875707182309),
+                                    ("Februaryintersect", -5.413875707182309),
+                                    ("last <cycle> of <time>year", -4.720728526622364),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -5.541263545158426),
-                                    ("yearminute", -5.541263545158426)],
-                               n = 191},
+                                     -5.413875707182309),
+                                    ("yearminute", -5.413875707182309)],
+                               n = 165},
                    koData =
-                     ClassData{prior = -0.9732575564808325,
-                               unseen = -5.8888779583328805,
+                     ClassData{prior = -1.0272875078461794, unseen = -5.717027701406222,
                                likelihoods =
                                  HashMap.fromList
-                                   [("in <named-month>year", -5.19295685089021),
+                                   [("in <named-month>year", -5.020585624949423),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.19295685089021),
-                                    ("hourday", -5.19295685089021),
+                                     -5.020585624949423),
+                                    ("hourday", -5.020585624949423),
                                     ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.19295685089021),
-                                    ("dayhour", -3.4011973816621555),
-                                    ("daymonth", -3.1780538303479458),
-                                    ("monthday", -4.787491742782046),
-                                    ("monthyear", -4.787491742782046),
-                                    ("intersecthh:mm", -5.19295685089021),
-                                    ("until <time-of-day><time-of-day> am|pm", -5.19295685089021),
+                                     -5.020585624949423),
+                                    ("dayhour", -3.228826155721369),
+                                    ("daymonth", -3.005682604407159),
+                                    ("monthday", -4.61512051684126),
+                                    ("monthyear", -4.61512051684126),
+                                    ("intersecthh:mm", -5.020585624949423),
+                                    ("until <time-of-day><time-of-day> am|pm", -5.020585624949423),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
-                                    ("<time-of-day> am|pmintersect", -3.9401938823948424),
+                                     -4.327438444389479),
+                                    ("<time-of-day> am|pmintersect", -3.767822656454056),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -4.499809670330265),
-                                    ("Tuesdayafter <time-of-day>", -5.19295685089021),
+                                     -4.327438444389479),
+                                    ("Tuesdayafter <time-of-day>", -5.020585624949423),
                                     ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.19295685089021),
-                                    ("intersect2hh:mm", -5.19295685089021),
-                                    ("absorption of , after named dayJuly", -4.787491742782046),
-                                    ("monthhour", -4.787491742782046),
-                                    ("todayat <time-of-day>", -5.19295685089021),
-                                    ("at <time-of-day>intersect2", -4.787491742782046),
-                                    ("dayday", -5.19295685089021),
-                                    ("mm/ddat <time-of-day>", -4.787491742782046),
-                                    ("<time-of-day> am|pmon <date>", -3.58351893845611),
-                                    ("absorption of , after named dayintersect2",
-                                     -5.19295685089021),
-                                    ("dayyear", -4.276666119016055),
-                                    ("Thursdayat <time-of-day>", -5.19295685089021),
-                                    ("August<time-of-day> am|pm", -5.19295685089021),
-                                    ("monthminute", -5.19295685089021),
-                                    ("<time-of-day> am|pmtomorrow", -5.19295685089021),
-                                    ("Thursdayhh:mm", -5.19295685089021),
+                                     -5.020585624949423),
+                                    ("absorption of , after named dayJuly", -4.61512051684126),
+                                    ("monthhour", -4.61512051684126),
+                                    ("todayat <time-of-day>", -5.020585624949423),
+                                    ("dayday", -5.020585624949423),
+                                    ("mm/ddat <time-of-day>", -4.61512051684126),
+                                    ("<time-of-day> am|pmon <date>", -3.767822656454056),
+                                    ("dayyear", -4.104294893075269),
+                                    ("Thursdayat <time-of-day>", -5.020585624949423),
+                                    ("August<time-of-day> am|pm", -5.020585624949423),
+                                    ("monthminute", -5.020585624949423),
+                                    ("<time-of-day> am|pmtomorrow", -5.020585624949423),
+                                    ("Thursdayhh:mm", -5.020585624949423),
                                     ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.19295685089021),
-                                    ("minutemonth", -3.0528906873939397),
+                                     -5.020585624949423),
+                                    ("minutemonth", -3.5165082281731497),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.787491742782046),
+                                     -4.61512051684126),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.787491742782046),
-                                    ("Aprilyear", -5.19295685089021),
+                                     -4.61512051684126),
+                                    ("Aprilyear", -5.020585624949423),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -4.787491742782046),
+                                     -4.61512051684126),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.19295685089021),
-                                    ("yesterday<time-of-day> am|pm", -5.19295685089021),
+                                     -5.020585624949423),
+                                    ("yesterday<time-of-day> am|pm", -5.020585624949423),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -4.0943445622221),
+                                     -4.104294893075269),
                                     ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.19295685089021),
-                                    ("until <time-of-day>on <date>", -4.499809670330265),
-                                    ("at <time-of-day>intersect", -4.787491742782046),
+                                     -5.020585624949423),
+                                    ("until <time-of-day>on <date>", -4.327438444389479),
+                                    ("at <time-of-day>intersect", -4.61512051684126),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.19295685089021),
-                                    ("dayminute", -2.995732273553991),
-                                    ("intersectSeptember", -3.6888794541139363),
+                                     -5.020585624949423),
+                                    ("dayminute", -3.0746754758941104),
+                                    ("intersectSeptember", -3.5165082281731497),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.787491742782046),
-                                    ("minuteday", -2.0794415416798357),
-                                    ("absorption of , after named dayintersect", -5.19295685089021),
-                                    ("Februaryin|during the <part-of-day>", -5.19295685089021),
-                                    ("yearhh:mm", -5.19295685089021),
-                                    ("hh:mmon <date>", -3.6888794541139363),
-                                    ("intersect2September", -3.6888794541139363),
+                                     -5.020585624949423),
+                                    ("minuteday", -2.217225244042889),
+                                    ("absorption of , after named dayintersect",
+                                     -5.020585624949423),
+                                    ("Februaryin|during the <part-of-day>", -5.020585624949423),
+                                    ("yearhh:mm", -5.020585624949423),
+                                    ("hh:mmon <date>", -3.5165082281731497),
                                     ("absorption of , after named daySeptember",
-                                     -4.276666119016055),
-                                    ("on <date>September", -4.787491742782046),
-                                    ("at <time-of-day>on <date>", -4.499809670330265),
-                                    ("<time-of-day> am|pmintersect2", -3.9401938823948424),
-                                    ("absorption of , after named dayFebruary", -4.276666119016055),
+                                     -4.104294893075269),
+                                    ("on <date>September", -4.61512051684126),
+                                    ("at <time-of-day>on <date>", -4.61512051684126),
+                                    ("absorption of , after named dayFebruary", -4.104294893075269),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.19295685089021),
-                                    ("tomorrowat <time-of-day>", -5.19295685089021),
-                                    ("tomorrow<time-of-day> am|pm", -5.19295685089021),
-                                    ("after <time-of-day><time-of-day> am|pm", -5.19295685089021),
-                                    ("after <time-of-day>year", -5.19295685089021),
-                                    ("yearminute", -5.19295685089021)],
-                               n = 116}}),
+                                     -5.020585624949423),
+                                    ("tomorrowat <time-of-day>", -5.020585624949423),
+                                    ("tomorrow<time-of-day> am|pm", -5.020585624949423),
+                                    ("after <time-of-day><time-of-day> am|pm", -5.020585624949423),
+                                    ("after <time-of-day>year", -5.020585624949423),
+                                    ("yearminute", -5.020585624949423)],
+                               n = 92}}),
        ("after lunch/work/school",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -991,24 +747,22 @@ classifiers
                                n = 22}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
+                     ClassData{prior = 0.0, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -2.1972245773362196),
-                                    ("ordinals (first..twentieth,thirtieth,...)week (grain)intersect2",
-                                     -2.1972245773362196),
-                                    ("quarteryear", -2.1972245773362196),
+                                   [("daymonth", -2.0149030205422647),
+                                    ("quarteryear", -2.0149030205422647),
                                     ("ordinals (first..twentieth,thirtieth,...)day (grain)October",
-                                     -2.1972245773362196),
+                                     -2.0149030205422647),
                                     ("ordinals (first..twentieth,thirtieth,...)week (grain)intersect",
-                                     -2.1972245773362196),
-                                    ("weekmonth", -1.5040773967762742),
-                                    ("ordinal (digits)quarter (grain)year", -2.1972245773362196),
+                                     -2.0149030205422647),
+                                    ("weekmonth", -1.6094379124341003),
+                                    ("ordinal (digits)quarter (grain)year", -2.0149030205422647),
                                     ("ordinals (first..twentieth,thirtieth,...)week (grain)October",
-                                     -2.1972245773362196)],
-                               n = 5},
+                                     -2.0149030205422647)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
+                     ClassData{prior = -infinity, unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
@@ -1019,34 +773,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("from <datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = -0.8472978603872037,
+                               unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.5260563034950494),
-                                    ("hh:mmhh:mm", -1.5260563034950494),
+                                   [("minuteminute", -1.4816045409242156),
+                                    ("hh:mmhh:mm", -1.4816045409242156),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4423470353692043),
-                                    ("hourhour", -2.03688192726104),
+                                     -2.3978952727983707),
+                                    ("hourhour", -1.9924301646902063),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4423470353692043)],
+                                     -2.3978952727983707)],
                                n = 6},
                    koData =
-                     ClassData{prior = -0.4700036292457356,
-                               unseen = -3.4657359027997265,
+                     ClassData{prior = -0.5596157879354228, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.824549292051046),
-                                    ("minuteminute", -1.824549292051046),
+                                   [("hh:mmtime-of-day (latent)", -1.6486586255873816),
+                                    ("minuteminute", -2.159484249353372),
                                     ("time-of-day (latent)time-of-day (latent)",
-                                     -2.740840023925201),
-                                    ("hourhour", -2.3353749158170367),
-                                    ("minutehour", -1.824549292051046),
-                                    ("hh:mmintersect", -2.3353749158170367),
-                                    ("hh:mmintersect2", -2.3353749158170367),
+                                     -2.5649493574615367),
+                                    ("hourhour", -2.159484249353372),
+                                    ("minutehour", -1.6486586255873816),
+                                    ("hh:mmintersect", -2.159484249353372),
                                     ("time-of-day (latent)<time-of-day> am|pm",
-                                     -2.740840023925201)],
-                               n = 10}}),
+                                     -2.5649493574615367)],
+                               n = 8}}),
        ("Saturday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1210,31 +962,27 @@ classifiers
                                n = 1}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.3184537311185346,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
                                    [("daymonth", -0.9808292530117262),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.4849066497880004),
-                                    ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect2",
                                      -2.0794415416798357),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.0794415416798357),
+                                     -1.6739764335716716),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.0794415416798357),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect2",
-                                     -2.4849066497880004)],
-                               n = 8},
+                                     -1.6739764335716716)],
+                               n = 5},
                    koData =
-                     ClassData{prior = -1.2992829841302609, unseen = -2.70805020110221,
+                     ClassData{prior = -0.9808292530117262,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.252762968495368),
+                                   [("daymonth", -1.0986122886681098),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.9459101490553135),
+                                     -1.791759469228055),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.540445040947149)],
+                                     -1.3862943611198906)],
                                n = 3}}),
        ("Valentine's Day",
         Classifier{okData =
@@ -1535,17 +1283,16 @@ classifiers
                                n = 7}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9555114450274363),
-                                    ("SundayMarch", -1.8718021769015913),
-                                    ("MondayMarch", -1.8718021769015913),
-                                    ("Sundayintersect2", -1.8718021769015913),
-                                    ("Sundayintersect", -1.8718021769015913)],
-                               n = 4},
+                                   [("daymonth", -0.916290731874155),
+                                    ("SundayMarch", -1.6094379124341003),
+                                    ("MondayMarch", -1.6094379124341003),
+                                    ("Sundayintersect", -1.6094379124341003)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.791759469228055,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
@@ -1744,130 +1491,106 @@ classifiers
                                n = 1}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.48665526283817767,
-                               unseen = -5.332718793265369,
+                     ClassData{prior = -0.41773520069997866,
+                               unseen = -5.1298987149230735,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.634728988229636),
-                                    ("dayhour", -3.381966019734268),
-                                    ("daymonth", -3.248434627109745),
+                                     -4.430816798843313),
+                                    ("dayhour", -3.1780538303479458),
+                                    ("daymonth", -3.1780538303479458),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.634728988229636),
+                                     -4.430816798843313),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.9415818076696905),
-                                    ("Wednesdayintersect", -4.634728988229636),
-                                    ("Labor Daythis|last|next <cycle>", -4.634728988229636),
-                                    ("intersectintersect2", -4.634728988229636),
+                                     -3.7376696182833684),
+                                    ("Wednesdayintersect", -4.430816798843313),
+                                    ("Labor Daythis|last|next <cycle>", -4.430816798843313),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -4.634728988229636),
-                                    ("<part-of-day> of <time>February", -4.634728988229636),
-                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
-                                    ("Wednesdayintersect2", -4.634728988229636),
+                                     -4.430816798843313),
+                                    ("<part-of-day> of <time>February", -4.430816798843313),
+                                    ("Saturday<time-of-day> am|pm", -4.430816798843313),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.634728988229636),
-                                    ("on <date><time-of-day> am|pm", -4.634728988229636),
-                                    ("hourmonth", -4.634728988229636),
+                                     -4.430816798843313),
+                                    ("on <date><time-of-day> am|pm", -4.430816798843313),
+                                    ("hourmonth", -4.430816798843313),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"intersect",
-                                     -4.634728988229636),
-                                    ("dayday", -2.7629268113280445),
-                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
-                                    ("intersect2intersect2", -4.634728988229636),
-                                    ("WednesdayOctober", -4.634728988229636),
-                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
+                                     -4.430816798843313),
+                                    ("dayday", -2.559014621941722),
+                                    ("the <day-of-month> (ordinal)February", -4.02535169073515),
+                                    ("WednesdayOctober", -4.430816798843313),
+                                    ("Wednesdaythis|last|next <cycle>", -4.02535169073515),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.7184382563554808),
-                                    ("dayyear", -3.0252910757955354),
+                                     -3.5145260669691587),
+                                    ("dayyear", -2.9267394020670396),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.634728988229636),
+                                     -4.430816798843313),
                                     ("<named-month> <day-of-month> (non ordinal)intersect",
-                                     -4.634728988229636),
-                                    ("Thursdayhh:mm", -4.229263880121471),
-                                    ("Thanksgiving Daythis|last|next <cycle>", -4.634728988229636),
-                                    ("Memorial Daythis|last|next <cycle>", -4.634728988229636),
-                                    ("<named-month> <day-of-month> (non ordinal)intersect2",
-                                     -4.634728988229636),
+                                     -4.430816798843313),
+                                    ("Thursdayhh:mm", -4.02535169073515),
+                                    ("Thanksgiving Daythis|last|next <cycle>", -4.430816798843313),
+                                    ("Memorial Daythis|last|next <cycle>", -4.430816798843313),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -4.229263880121471),
-                                    ("TuesdayOctober", -4.634728988229636),
-                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
-                                    ("Mondaythis|last|next <cycle>", -4.634728988229636),
-                                    ("intersect2<named-month> <day-of-month> (non ordinal)",
-                                     -3.7184382563554808),
+                                     -4.02535169073515),
+                                    ("TuesdayOctober", -4.430816798843313),
+                                    ("the <day-of-month> (ordinal)March", -4.430816798843313),
+                                    ("Mondaythis|last|next <cycle>", -4.430816798843313),
                                     ("Fridayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -3.9415818076696905),
-                                    ("Fridayintersect", -4.634728988229636),
+                                     -4.02535169073515),
+                                    ("Fridayintersect", -4.430816798843313),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -3.9415818076696905),
+                                     -3.7376696182833684),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.7184382563554808),
-                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
+                                     -3.5145260669691587),
+                                    ("Tuesdaythis|last|next <cycle>", -4.430816798843313),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.634728988229636),
-                                    ("dayminute", -2.3834371896231406),
-                                    ("intersect by \",\", \"of\", \"from\", \"'s\"intersect2",
-                                     -4.634728988229636),
-                                    ("intersect2intersect", -4.634728988229636),
-                                    ("intersectyear", -4.634728988229636),
-                                    ("minuteday", -3.1306515914533617),
-                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
-                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
-                                    ("intersectintersect", -4.634728988229636),
-                                    ("weekday", -4.634728988229636),
-                                    ("dayweek", -3.536116699561526),
-                                    ("intersect2year", -4.634728988229636),
-                                    ("Thursday<time-of-day> am|pm", -4.634728988229636),
+                                     -4.430816798843313),
+                                    ("dayminute", -2.639057329615259),
+                                    ("intersectyear", -4.430816798843313),
+                                    ("minuteday", -3.5145260669691587),
+                                    ("this|last|next <cycle>Sunday", -4.430816798843313),
+                                    ("Sundaythis|last|next <cycle>", -4.430816798843313),
+                                    ("intersectintersect", -4.430816798843313),
+                                    ("weekday", -4.430816798843313),
+                                    ("dayweek", -3.332204510175204),
+                                    ("Thursday<time-of-day> am|pm", -4.430816798843313),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.229263880121471),
-                                    ("Fridayintersect2", -4.634728988229636),
+                                     -4.02535169073515),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -4.229263880121471)],
-                               n = 67},
+                                     -4.02535169073515)],
+                               n = 54},
                    koData =
-                     ClassData{prior = -0.9536782639457754, unseen = -5.056245805348308,
+                     ClassData{prior = -1.074514737089049, unseen = -4.762173934797756,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -2.005333569526114),
-                                    ("TuesdaySeptember", -4.356708826689592),
-                                    ("Wednesdayintersect", -4.356708826689592),
-                                    ("intersectintersect2", -4.356708826689592),
-                                    ("Wednesdayintersect2", -4.356708826689592),
+                                   [("daymonth", -1.8632184332102),
+                                    ("TuesdaySeptember", -4.060443010546419),
+                                    ("Wednesdayintersect", -4.060443010546419),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"intersect",
-                                     -4.356708826689592),
-                                    ("SundayFebruary", -4.356708826689592),
-                                    ("intersect2intersect2", -4.356708826689592),
-                                    ("WednesdayOctober", -4.356708826689592),
-                                    ("FridayJuly", -3.951243718581427),
+                                     -4.060443010546419),
+                                    ("SundayFebruary", -4.060443010546419),
+                                    ("WednesdayOctober", -4.060443010546419),
+                                    ("FridayJuly", -3.654977902438255),
                                     ("<named-month> <day-of-month> (non ordinal)intersect",
-                                     -4.356708826689592),
-                                    ("FridaySeptember", -4.356708826689592),
-                                    ("WednesdayFebruary", -4.356708826689592),
-                                    ("minutemonth", -2.8526314299133175),
-                                    ("<named-month> <day-of-month> (non ordinal)intersect2",
-                                     -4.356708826689592),
-                                    ("SundayMarch", -4.356708826689592),
+                                     -4.060443010546419),
+                                    ("FridaySeptember", -4.060443010546419),
+                                    ("WednesdayFebruary", -4.060443010546419),
+                                    ("minutemonth", -3.144152278672264),
+                                    ("SundayMarch", -4.060443010546419),
                                     ("Fridayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -3.951243718581427),
-                                    ("MondayFebruary", -3.951243718581427),
-                                    ("Tuesdayintersect2", -4.356708826689592),
-                                    ("Fridayintersect", -4.356708826689592),
+                                     -4.060443010546419),
+                                    ("MondayFebruary", -3.654977902438255),
+                                    ("Fridayintersect", -4.060443010546419),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.951243718581427),
-                                    ("dayminute", -2.341805806147327),
-                                    ("intersect by \",\", \"of\", \"from\", \"'s\"intersect2",
-                                     -4.356708826689592),
-                                    ("intersect2intersect", -4.356708826689592),
-                                    ("SaturdaySeptember", -4.356708826689592),
-                                    ("intersectSeptember", -3.4404180948154366),
-                                    ("MondayMarch", -4.356708826689592),
-                                    ("intersect2September", -3.4404180948154366),
-                                    ("on <date>September", -3.951243718581427),
-                                    ("intersectintersect", -4.356708826689592),
-                                    ("Sundayintersect2", -4.356708826689592),
-                                    ("Fridayintersect2", -4.356708826689592),
-                                    ("Tuesdayintersect", -4.356708826689592),
-                                    ("Sundayintersect", -4.356708826689592)],
-                               n = 42}}),
+                                     -3.654977902438255),
+                                    ("dayminute", -2.6741486494265287),
+                                    ("SaturdaySeptember", -4.060443010546419),
+                                    ("intersectSeptember", -3.144152278672264),
+                                    ("MondayMarch", -4.060443010546419),
+                                    ("on <date>September", -3.654977902438255),
+                                    ("intersectintersect", -4.060443010546419),
+                                    ("Tuesdayintersect", -4.060443010546419),
+                                    ("Sundayintersect", -4.060443010546419)],
+                               n = 28}}),
        ("last <time>",
         Classifier{okData =
                      ClassData{prior = -1.2729656758128873, unseen = -3.295836866004329,
@@ -1939,26 +1662,23 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("until <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -1.2039728043259361,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.9808292530117262, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -1.6582280766035324),
-                                    ("hh:mm", -1.9459101490553135), ("hour", -1.9459101490553135),
-                                    ("minute", -1.4350845252893227)],
+                                   [("time-of-day (latent)", -2.3025850929940455),
+                                    ("<time-of-day> am|pm", -1.6094379124341003),
+                                    ("hh:mm", -1.8971199848858813), ("hour", -1.8971199848858813),
+                                    ("minute", -1.3862943611198906)],
                                n = 6},
                    koData =
-                     ClassData{prior = -0.35667494393873245,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.4700036292457356, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.001480000210124),
-                                    ("intersect", -2.001480000210124),
-                                    ("yesterday", -2.512305623976115), ("day", -2.512305623976115),
-                                    ("hh:mm", -2.001480000210124), ("hour", -2.512305623976115),
-                                    ("minute", -1.213022639845854)],
-                               n = 14}}),
+                                   [("intersect", -1.7227665977411035),
+                                    ("yesterday", -2.2335922215070942),
+                                    ("day", -2.2335922215070942), ("hh:mm", -1.7227665977411035),
+                                    ("hour", -2.639057329615259), ("minute", -1.252762968495368)],
+                               n = 10}}),
        ("<duration> after|before|from <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2083,42 +1803,42 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.661398482245365, unseen = -3.9318256327243257,
+                     ClassData{prior = -0.48550781578170077,
+                               unseen = -3.891820298110627,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.5141277326297755),
-                                    ("hh:mmhh:mm", -1.7147984280919266),
-                                    ("dayday", -2.8134107167600364),
-                                    ("hourhour", -2.3025850929940455),
+                                   [("minuteminute", -1.4733057381095205),
+                                    ("hh:mmhh:mm", -1.6739764335716716),
+                                    ("dayday", -2.772588722239781),
+                                    ("hourhour", -2.2617630984737906),
                                     ("<named-month> <day-of-month> (non ordinal)<named-month> <day-of-month> (non ordinal)",
-                                     -2.8134107167600364),
+                                     -2.772588722239781),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -2.8134107167600364),
+                                     -2.772588722239781),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -3.2188758248682006),
+                                     -3.1780538303479458),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.5257286443082556)],
+                                     -2.4849066497880004)],
                                n = 16},
                    koData =
-                     ClassData{prior = -0.7259370033829361, unseen = -3.891820298110627,
+                     ClassData{prior = -0.9555114450274363,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
                                    [("<named-month> <day-of-month> (non ordinal)July",
-                                     -3.1780538303479458),
-                                    ("daymonth", -2.772588722239781),
-                                    ("<time-of-day> am|pmintersect", -3.1780538303479458),
-                                    ("hh:mm<time-of-day> am|pm", -2.772588722239781),
-                                    ("minuteminute", -1.6739764335716716),
+                                     -2.890371757896165),
+                                    ("daymonth", -2.4849066497880004),
+                                    ("<time-of-day> am|pmintersect", -2.890371757896165),
+                                    ("hh:mm<time-of-day> am|pm", -2.4849066497880004),
+                                    ("minuteminute", -1.9740810260220096),
                                     ("hourhour", -2.4849066497880004),
-                                    ("minutehour", -2.772588722239781),
-                                    ("hh:mmintersect", -2.2617630984737906),
+                                    ("minutehour", -2.4849066497880004),
+                                    ("hh:mmintersect", -1.9740810260220096),
                                     ("<named-month> <day-of-month> (non ordinal)August",
-                                     -3.1780538303479458),
+                                     -2.890371757896165),
                                     ("about|exactly <time-of-day><time-of-day> am|pm",
-                                     -3.1780538303479458),
-                                    ("hh:mmintersect2", -2.2617630984737906),
-                                    ("<time-of-day> am|pmintersect2", -3.1780538303479458)],
-                               n = 15}}),
+                                     -2.890371757896165)],
+                               n = 10}}),
        ("Tuesday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2198,24 +1918,20 @@ classifiers
                                n = 19}}),
        ("nth <time> after <time>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.1972245773362196,
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayday", -0.9808292530117262),
+                                   [("dayday", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -1.3862943611198906),
-                                    ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect2",
-                                     -1.3862943611198906)],
-                               n = 2},
+                                     -0.916290731874155)],
+                               n = 1},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.9459101490553135,
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayday", -1.0986122886681098),
+                                   [("dayday", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayChristmas",
-                                     -1.0986122886681098)],
+                                     -0.916290731874155)],
                                n = 1}}),
        ("<named-month> <day-of-month> (non ordinal)",
         Classifier{okData =
@@ -2270,20 +1986,18 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("last <cycle> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
+                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("day (grain)October", -2.159484249353372),
-                                    ("daymonth", -1.3121863889661687),
-                                    ("day (grain)intersect", -2.159484249353372),
-                                    ("day (grain)intersect2", -2.159484249353372),
-                                    ("weekmonth", -1.8718021769015913),
-                                    ("week (grain)intersect", -2.5649493574615367),
-                                    ("week (grain)September", -2.5649493574615367),
-                                    ("week (grain)intersect2", -2.5649493574615367)],
-                               n = 9},
+                                   [("day (grain)October", -1.791759469228055),
+                                    ("daymonth", -1.2809338454620642),
+                                    ("day (grain)intersect", -1.791759469228055),
+                                    ("weekmonth", -1.791759469228055),
+                                    ("week (grain)intersect", -2.1972245773362196),
+                                    ("week (grain)September", -2.1972245773362196)],
+                               n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("seasons",
         Classifier{okData =
@@ -2323,25 +2037,25 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("after <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -1.791759469228055, unseen = -2.5649493574615367,
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -2.4849066497880004,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.791759469228055),
-                                    ("<time-of-day> am|pm", -1.791759469228055),
-                                    ("hour", -1.3862943611198906)],
+                                   [("time-of-day (latent)", -1.7047480922384253),
+                                    ("<time-of-day> am|pm", -1.7047480922384253),
+                                    ("hour", -1.2992829841302609)],
                                n = 2},
                    koData =
-                     ClassData{prior = -0.1823215567939546, unseen = -3.367295829986474,
+                     ClassData{prior = -0.2231435513142097,
+                               unseen = -3.1780538303479458,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.2335922215070942),
-                                    ("intersect", -2.2335922215070942),
-                                    ("tomorrow", -2.2335922215070942), ("day", -1.3862943611198906),
-                                    ("time-of-day (latent)", -2.639057329615259),
-                                    ("<time-of-day> am|pm", -2.639057329615259),
-                                    ("Christmas", -2.2335922215070942),
-                                    ("hour", -1.7227665977411035)],
-                               n = 10}}),
+                                   [("intersect", -2.03688192726104),
+                                    ("tomorrow", -2.03688192726104), ("day", -1.3437347467010947),
+                                    ("time-of-day (latent)", -2.4423470353692043),
+                                    ("<time-of-day> am|pm", -2.4423470353692043),
+                                    ("Christmas", -2.03688192726104), ("hour", -1.749199854809259)],
+                               n = 8}}),
        ("day (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -2351,24 +2065,23 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.4849066497880004,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.0986122886681098),
-                                    ("hh:mmhh:mm", -1.0986122886681098)],
+                                   [("minuteminute", -1.0116009116784799),
+                                    ("hh:mmhh:mm", -1.0116009116784799)],
                                n = 3},
                    koData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("minuteminute", -1.2321436812926323),
-                                    ("minutehour", -1.791759469228055),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hh:mmintersect2", -1.791759469228055)],
-                               n = 9}}),
+                                   [("hh:mmtime-of-day (latent)", -1.4469189829363254),
+                                    ("minuteminute", -1.4469189829363254),
+                                    ("minutehour", -1.4469189829363254),
+                                    ("hh:mmintersect", -1.4469189829363254)],
+                               n = 6}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2390,26 +2103,26 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("this <time>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -3.58351893845611,
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -2.8622008809294686),
-                                    ("Martin Luther King's Day", -2.8622008809294686),
-                                    ("intersect2", -2.8622008809294686),
-                                    ("intersect", -2.8622008809294686),
-                                    ("Monday", -2.8622008809294686), ("day", -1.4759065198095778),
-                                    ("Thanksgiving Day", -2.8622008809294686),
-                                    ("hour", -1.7635885922613588), ("seasons", -2.169053700369523),
-                                    ("week-end", -2.8622008809294686),
-                                    ("part of days", -2.456735772821304)],
-                               n = 12},
+                                   [("Thursday", -2.772588722239781),
+                                    ("Martin Luther King's Day", -2.772588722239781),
+                                    ("intersect", -2.772588722239781),
+                                    ("Monday", -2.772588722239781), ("day", -1.3862943611198906),
+                                    ("Thanksgiving Day", -2.772588722239781),
+                                    ("hour", -1.8562979903656263), ("seasons", -2.0794415416798357),
+                                    ("week-end", -2.772588722239781),
+                                    ("part of days", -2.367123614131617)],
+                               n = 11},
                    koData =
-                     ClassData{prior = -2.5649493574615367, unseen = -2.639057329615259,
+                     ClassData{prior = -2.4849066497880004,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -1.8718021769015913),
-                                    ("part of days", -1.8718021769015913)],
+                                   [("hour", -1.791759469228055),
+                                    ("part of days", -1.791759469228055)],
                                n = 1}}),
        ("August",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/NB.hs b/Duckling/Ranking/Classifiers/NB.hs
index 8f3de382..78a29abb 100644
--- a/Duckling/Ranking/Classifiers/NB.hs
+++ b/Duckling/Ranking/Classifiers/NB.hs
@@ -62,150 +62,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("intersect2",
-        Classifier{okData =
-                     ClassData{prior = -0.44134339577306625,
-                               unseen = -5.926926025970411,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.132496328186477),
-                                    ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.132496328186477),
-                                    ("hourday", -5.231108616854587),
-                                    ("dayhour", -2.9798168182480915),
-                                    ("daymonth", -2.788761581485382),
-                                    ("monthyear", -3.1516670751747506),
-                                    ("intersecthh:mm", -5.231108616854587),
-                                    ("the <day-of-month> (ordinal)named-month", -3.978345648359219),
-                                    ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.825643508746422),
-                                    ("intersect2hh:mm", -5.231108616854587),
-                                    ("last <day-of-week> of <time>year", -4.825643508746422),
-                                    ("todayat <time-of-day>", -4.825643508746422),
-                                    ("dayday", -2.9798168182480915),
-                                    ("dd/mmat <time-of-day>", -4.314817884980432),
-                                    ("intersect by \",\"hh:mm", -4.132496328186477),
-                                    ("absorption of , after named dayintersect2",
-                                     -5.231108616854587),
-                                    ("intersectnamed-month", -4.825643508746422),
-                                    ("dayyear", -3.359306439952995),
-                                    ("named-daythis <time>", -3.844814255734696),
-                                    ("tomorrow<time-of-day> sharp", -4.825643508746422),
-                                    ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.825643508746422),
-                                    ("named-day<time> timezone", -4.537961436294641),
-                                    ("named-monthyear", -3.1516670751747506),
-                                    ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.132496328186477),
-                                    ("on <date>named-month", -3.978345648359219),
-                                    ("tomorrowuntil <time-of-day>", -4.825643508746422),
-                                    ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.537961436294641),
-                                    ("intersect2named-month", -4.825643508746422),
-                                    ("after <time-of-day>at <time-of-day>", -4.825643508746422),
-                                    ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.825643508746422),
-                                    ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.231108616854587),
-                                    ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.231108616854587),
-                                    ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.825643508746422),
-                                    ("named-daynext <cycle>", -5.231108616854587),
-                                    ("named-dayintersect", -4.825643508746422),
-                                    ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.825643508746422),
-                                    ("tomorrowafter <time-of-day>", -4.825643508746422),
-                                    ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.314817884980432),
-                                    ("dayminute", -2.7053799725463312),
-                                    ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.537961436294641),
-                                    ("<ordinal> <cycle> of <time>year", -4.825643508746422),
-                                    ("minuteday", -2.628418931410203),
-                                    ("absorption of , after named dayintersect",
-                                     -5.231108616854587),
-                                    ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.231108616854587),
-                                    ("named-dayon <date>", -4.825643508746422),
-                                    ("named-dayat <time-of-day>", -4.825643508746422),
-                                    ("named-dayintersect2", -4.825643508746422),
-                                    ("yearhh:mm", -5.231108616854587),
-                                    ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.231108616854587),
-                                    ("absorption of , after named dayintersect by \",\"",
-                                     -4.537961436294641),
-                                    ("dd/mmyear", -4.825643508746422),
-                                    ("at <time-of-day>on <date>", -5.231108616854587),
-                                    ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.231108616854587),
-                                    ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.231108616854587),
-                                    ("dayweek", -4.132496328186477),
-                                    ("weekyear", -4.314817884980432),
-                                    ("hh:mmtomorrow", -4.537961436294641),
-                                    ("tomorrowat <time-of-day>", -3.978345648359219),
-                                    ("named-daythis <cycle>", -4.537961436294641),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.231108616854587),
-                                    ("at <time-of-day>tomorrow", -4.825643508746422),
-                                    ("last <cycle> of <time>year", -4.314817884980432),
-                                    ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.825643508746422),
-                                    ("yearminute", -5.231108616854587)],
-                               n = 146},
-                   koData =
-                     ClassData{prior = -1.030500862808964, unseen = -5.5012582105447265,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("named-daynamed-month", -4.804021044733257),
-                                    ("dayhour", -3.2999436479569826),
-                                    ("daymonth", -2.0006606638267215),
-                                    ("monthday", -3.8877303128591016),
-                                    ("monthyear", -3.8877303128591016),
-                                    ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.5512580762378887),
-                                    ("named-dayhh:mm", -4.804021044733257),
-                                    ("dd/mmat <time-of-day>", -3.8877303128591016),
-                                    ("hourhour", -3.5512580762378887),
-                                    ("dayyear", -3.5512580762378887),
-                                    ("named-daythis <time>", -2.361674009364052),
-                                    ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.398555936625092),
-                                    ("minutemonth", -4.398555936625092),
-                                    ("named-monthyear", -3.8877303128591016),
-                                    ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.398555936625092),
-                                    ("absorption of , after named daynamed-month",
-                                     -3.7054087560651467),
-                                    ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.804021044733257),
-                                    ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.398555936625092),
-                                    ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.804021044733257),
-                                    ("until <time-of-day>on <date>", -4.804021044733257),
-                                    ("dayminute", -3.417726683613366),
-                                    ("minuteday", -3.2999436479569826),
-                                    ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.804021044733257),
-                                    ("named-dayon <date>", -4.804021044733257),
-                                    ("named-dayat <time-of-day>", -3.8877303128591016),
-                                    ("hh:mmon <date>", -3.417726683613366),
-                                    ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.804021044733257),
-                                    ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -3.8877303128591016),
-                                    ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -3.8877303128591016),
-                                    ("this <part-of-day>until <time-of-day>", -4.398555936625092),
-                                    ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.398555936625092),
-                                    ("tomorrownoon", -4.804021044733257),
-                                    ("this <time>until <time-of-day>", -4.398555936625092),
-                                    ("minuteyear", -4.398555936625092),
-                                    ("yearminute", -4.398555936625092)],
-                               n = 81}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -0.5596157879354228, unseen = -2.772588722239781,
@@ -331,23 +187,22 @@ classifiers
                                n = 2}}),
        ("between <datetime> and <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -0.916290731874155, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2039728043259361),
-                                    ("hh:mmhh:mm", -1.2039728043259361)],
+                                   [("minuteminute", -1.0986122886681098),
+                                    ("hh:mmhh:mm", -1.0986122886681098)],
                                n = 2},
                    koData =
-                     ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
+                     ClassData{prior = -0.5108256237659907,
+                               unseen = -2.4849066497880004,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.540445040947149),
-                                    ("minuteminute", -1.540445040947149),
-                                    ("minutehour", -1.540445040947149),
-                                    ("hh:mmintersect", -1.9459101490553135),
-                                    ("hh:mmintersect2", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("hh:mmtime-of-day (latent)", -1.2992829841302609),
+                                    ("minuteminute", -1.7047480922384253),
+                                    ("minutehour", -1.2992829841302609),
+                                    ("hh:mmintersect", -1.7047480922384253)],
+                               n = 3}}),
        ("month (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -415,166 +270,158 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.44134339577306625,
-                               unseen = -5.926926025970411,
+                     ClassData{prior = -0.4392032477400145, unseen = -5.860786223465865,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.132496328186477),
+                                     -4.0661736852554045),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.132496328186477),
-                                    ("hourday", -5.231108616854587),
-                                    ("dayhour", -2.9798168182480915),
-                                    ("daymonth", -2.788761581485382),
-                                    ("monthyear", -3.1516670751747506),
-                                    ("intersecthh:mm", -5.231108616854587),
-                                    ("the <day-of-month> (ordinal)named-month", -3.978345648359219),
+                                     -4.0661736852554045),
+                                    ("hourday", -5.1647859739235145),
+                                    ("dayhour", -2.9134941753170187),
+                                    ("daymonth", -2.9134941753170187),
+                                    ("monthyear", -3.0853444322436783),
+                                    ("intersecthh:mm", -5.1647859739235145),
+                                    ("the <day-of-month> (ordinal)named-month", -3.912023005428146),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.825643508746422),
-                                    ("intersect2hh:mm", -5.231108616854587),
-                                    ("last <day-of-week> of <time>year", -4.825643508746422),
-                                    ("todayat <time-of-day>", -4.825643508746422),
-                                    ("dayday", -2.9798168182480915),
-                                    ("dd/mmat <time-of-day>", -4.314817884980432),
-                                    ("intersect by \",\"hh:mm", -4.132496328186477),
-                                    ("absorption of , after named dayintersect2",
-                                     -5.231108616854587),
-                                    ("intersectnamed-month", -4.825643508746422),
-                                    ("dayyear", -3.359306439952995),
-                                    ("named-daythis <time>", -3.844814255734696),
-                                    ("tomorrow<time-of-day> sharp", -4.825643508746422),
+                                     -4.75932086581535),
+                                    ("last <day-of-week> of <time>year", -4.75932086581535),
+                                    ("todayat <time-of-day>", -4.75932086581535),
+                                    ("dayday", -3.0247198104272432),
+                                    ("dd/mmat <time-of-day>", -4.248495242049359),
+                                    ("intersect by \",\"hh:mm", -4.248495242049359),
+                                    ("intersectnamed-month", -4.75932086581535),
+                                    ("dayyear", -3.2929837970219227),
+                                    ("named-daythis <time>", -4.0661736852554045),
+                                    ("tomorrow<time-of-day> sharp", -4.75932086581535),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.825643508746422),
-                                    ("named-day<time> timezone", -4.537961436294641),
-                                    ("named-monthyear", -3.1516670751747506),
+                                     -4.75932086581535),
+                                    ("named-day<time> timezone", -4.471638793363569),
+                                    ("named-monthyear", -3.0853444322436783),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.132496328186477),
-                                    ("on <date>named-month", -3.978345648359219),
-                                    ("tomorrowuntil <time-of-day>", -4.825643508746422),
+                                     -4.0661736852554045),
+                                    ("on <date>named-month", -3.912023005428146),
+                                    ("tomorrowuntil <time-of-day>", -4.75932086581535),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.537961436294641),
-                                    ("intersect2named-month", -4.825643508746422),
-                                    ("after <time-of-day>at <time-of-day>", -4.825643508746422),
+                                     -4.471638793363569),
+                                    ("after <time-of-day>at <time-of-day>", -4.75932086581535),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.825643508746422),
+                                     -4.75932086581535),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.231108616854587),
+                                     -5.1647859739235145),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.231108616854587),
+                                     -5.1647859739235145),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.825643508746422),
-                                    ("named-daynext <cycle>", -5.231108616854587),
-                                    ("named-dayintersect", -4.825643508746422),
+                                     -4.75932086581535),
+                                    ("named-daynext <cycle>", -5.1647859739235145),
+                                    ("named-dayintersect", -4.75932086581535),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.825643508746422),
-                                    ("tomorrowafter <time-of-day>", -4.825643508746422),
+                                     -4.75932086581535),
+                                    ("tomorrowafter <time-of-day>", -4.75932086581535),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.314817884980432),
-                                    ("dayminute", -2.7053799725463312),
+                                     -4.248495242049359),
+                                    ("dayminute", -2.8134107167600364),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.537961436294641),
-                                    ("<ordinal> <cycle> of <time>year", -4.825643508746422),
-                                    ("minuteday", -2.628418931410203),
+                                     -4.471638793363569),
+                                    ("<ordinal> <cycle> of <time>year", -4.75932086581535),
+                                    ("minuteday", -2.5620962884791303),
                                     ("absorption of , after named dayintersect",
-                                     -5.231108616854587),
+                                     -5.1647859739235145),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.231108616854587),
-                                    ("named-dayon <date>", -4.825643508746422),
-                                    ("named-dayat <time-of-day>", -4.825643508746422),
-                                    ("named-dayintersect2", -4.825643508746422),
-                                    ("yearhh:mm", -5.231108616854587),
+                                     -5.1647859739235145),
+                                    ("named-dayon <date>", -4.75932086581535),
+                                    ("named-dayat <time-of-day>", -4.75932086581535),
+                                    ("yearhh:mm", -5.1647859739235145),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.231108616854587),
+                                     -5.1647859739235145),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -4.537961436294641),
-                                    ("dd/mmyear", -4.825643508746422),
-                                    ("at <time-of-day>on <date>", -5.231108616854587),
+                                     -4.75932086581535),
+                                    ("dd/mmyear", -4.75932086581535),
+                                    ("at <time-of-day>on <date>", -5.1647859739235145),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.231108616854587),
+                                     -5.1647859739235145),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.231108616854587),
-                                    ("dayweek", -4.132496328186477),
-                                    ("weekyear", -4.314817884980432),
-                                    ("hh:mmtomorrow", -4.537961436294641),
-                                    ("tomorrowat <time-of-day>", -3.978345648359219),
-                                    ("named-daythis <cycle>", -4.537961436294641),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.231108616854587),
-                                    ("at <time-of-day>tomorrow", -4.825643508746422),
-                                    ("last <cycle> of <time>year", -4.314817884980432),
+                                     -5.1647859739235145),
+                                    ("dayweek", -4.0661736852554045),
+                                    ("weekyear", -4.248495242049359),
+                                    ("hh:mmtomorrow", -4.471638793363569),
+                                    ("tomorrowat <time-of-day>", -3.912023005428146),
+                                    ("named-daythis <cycle>", -4.471638793363569),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.1647859739235145),
+                                    ("at <time-of-day>tomorrow", -4.75932086581535),
+                                    ("last <cycle> of <time>year", -4.248495242049359),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.825643508746422),
-                                    ("yearminute", -5.231108616854587)],
-                               n = 146},
+                                     -4.75932086581535),
+                                    ("yearminute", -5.1647859739235145)],
+                               n = 136},
                    koData =
-                     ClassData{prior = -1.030500862808964, unseen = -5.5012582105447265,
+                     ClassData{prior = -1.034370019939756, unseen = -5.43372200355424,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -4.804021044733257),
-                                    ("dayhour", -3.2999436479569826),
-                                    ("daymonth", -2.0006606638267215),
-                                    ("monthday", -3.8877303128591016),
-                                    ("monthyear", -3.8877303128591016),
+                                   [("named-daynamed-month", -4.736198448394496),
+                                    ("dayhour", -3.2321210516182215),
+                                    ("daymonth", -2.133508762950112),
+                                    ("monthday", -3.8199077165203406),
+                                    ("monthyear", -3.8199077165203406),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.5512580762378887),
-                                    ("named-dayhh:mm", -4.804021044733257),
-                                    ("dd/mmat <time-of-day>", -3.8877303128591016),
-                                    ("hourhour", -3.5512580762378887),
-                                    ("dayyear", -3.5512580762378887),
-                                    ("named-daythis <time>", -2.361674009364052),
+                                     -3.4834354798991276),
+                                    ("named-dayhh:mm", -4.736198448394496),
+                                    ("dd/mmat <time-of-day>", -3.8199077165203406),
+                                    ("hourhour", -3.4834354798991276),
+                                    ("dayyear", -3.4834354798991276),
+                                    ("named-daythis <time>", -2.596132284898225),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.398555936625092),
-                                    ("minutemonth", -4.398555936625092),
-                                    ("named-monthyear", -3.8877303128591016),
+                                     -4.330733340286331),
+                                    ("minutemonth", -4.330733340286331),
+                                    ("named-monthyear", -3.8199077165203406),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.398555936625092),
+                                     -4.330733340286331),
                                     ("absorption of , after named daynamed-month",
-                                     -3.7054087560651467),
+                                     -3.6375861597263857),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.804021044733257),
+                                     -4.736198448394496),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.398555936625092),
+                                     -4.330733340286331),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.804021044733257),
-                                    ("until <time-of-day>on <date>", -4.804021044733257),
-                                    ("dayminute", -3.417726683613366),
-                                    ("minuteday", -3.2999436479569826),
+                                     -4.736198448394496),
+                                    ("until <time-of-day>on <date>", -4.736198448394496),
+                                    ("dayminute", -3.349904087274605),
+                                    ("minuteday", -3.2321210516182215),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.804021044733257),
-                                    ("named-dayon <date>", -4.804021044733257),
-                                    ("named-dayat <time-of-day>", -3.8877303128591016),
-                                    ("hh:mmon <date>", -3.417726683613366),
+                                     -4.736198448394496),
+                                    ("named-dayon <date>", -4.736198448394496),
+                                    ("named-dayat <time-of-day>", -3.8199077165203406),
+                                    ("hh:mmon <date>", -3.349904087274605),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.804021044733257),
+                                     -4.736198448394496),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -3.8877303128591016),
+                                     -3.8199077165203406),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -3.8877303128591016),
-                                    ("this <part-of-day>until <time-of-day>", -4.398555936625092),
+                                     -3.8199077165203406),
+                                    ("this <part-of-day>until <time-of-day>", -4.330733340286331),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.398555936625092),
-                                    ("tomorrownoon", -4.804021044733257),
-                                    ("this <time>until <time-of-day>", -4.398555936625092),
-                                    ("minuteyear", -4.398555936625092),
-                                    ("yearminute", -4.398555936625092)],
-                               n = 81}}),
+                                     -4.330733340286331),
+                                    ("tomorrownoon", -4.736198448394496),
+                                    ("this <time>until <time-of-day>", -4.330733340286331),
+                                    ("minuteyear", -4.330733340286331),
+                                    ("yearminute", -4.330733340286331)],
+                               n = 75}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.9924301646902063),
-                                    ("ordinals (first..31st)week (grain)intersect2",
-                                     -1.9924301646902063),
+                                   [("daymonth", -1.7346010553881064),
                                     ("ordinals (first..31st)week (grain)intersect",
-                                     -1.9924301646902063),
+                                     -1.7346010553881064),
                                     ("ordinals (first..31st)week (grain)named-month",
-                                     -1.9924301646902063),
-                                    ("weekmonth", -1.1451323043030026),
+                                     -1.7346010553881064),
+                                    ("weekmonth", -1.2237754316221157),
                                     ("ordinals (first..31st)day (grain)named-month",
-                                     -1.9924301646902063)],
-                               n = 8},
+                                     -1.7346010553881064)],
+                               n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("season",
         Classifier{okData =
@@ -592,27 +439,25 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("from <datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -0.8754687373538999, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2809338454620642),
+                                   [("minuteminute", -1.2237754316221157),
                                     ("time-of-day (latent)time-of-day (latent)",
-                                     -2.1972245773362196),
-                                    ("hh:mmhh:mm", -1.2809338454620642),
-                                    ("hourhour", -2.1972245773362196)],
+                                     -2.1400661634962708),
+                                    ("hh:mmhh:mm", -1.2237754316221157),
+                                    ("hourhour", -2.1400661634962708)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.367295829986474,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.0910424533583156,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.7227665977411035),
-                                    ("minuteminute", -1.3862943611198906),
-                                    ("minutehour", -1.7227665977411035),
-                                    ("hh:mmintersect", -1.9459101490553135),
-                                    ("hh:mmintersect2", -1.9459101490553135)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -1.4350845252893227),
+                                    ("minuteminute", -1.6582280766035324),
+                                    ("minutehour", -1.4350845252893227),
+                                    ("hh:mmintersect", -1.6582280766035324)],
+                               n = 7}}),
        ("next <cycle>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.044522437723423,
@@ -742,25 +587,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.35667494393873245,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -0.5596157879354228, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.7576857016975165),
-                                    ("ordinals (first..31st)named-dayintersect2",
-                                     -1.5198257537444133),
+                                   [("daymonth", -0.7472144018302211),
                                     ("ordinals (first..31st)named-dayintersect",
-                                     -1.5198257537444133),
+                                     -0.9985288301111273),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -2.367123614131617)],
-                               n = 14},
+                                     -1.845826690498331)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -1.2039728043259361, unseen = -2.833213344056216,
+                     ClassData{prior = -0.8472978603872037, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.8266785731844679),
+                                   [("daymonth", -0.7621400520468967),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -0.8266785731844679)],
+                                     -0.7621400520468967)],
                                n = 6}}),
        ("the <day-of-month> (non ordinal)",
         Classifier{okData =
@@ -1026,16 +868,15 @@ classifiers
                                n = 4}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.044522437723423,
+                     ClassData{prior = 0.0, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.3862943611198906),
-                                    ("daymonth", -0.7985076962177716),
-                                    ("named-dayintersect", -1.8971199848858813),
-                                    ("named-dayintersect2", -1.8971199848858813)],
-                               n = 8},
+                                   [("named-daynamed-month", -1.0986122886681098),
+                                    ("daymonth", -0.7621400520468967),
+                                    ("named-dayintersect", -1.6094379124341003)],
+                               n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
@@ -1132,58 +973,47 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\"",
         Classifier{okData =
-                     ClassData{prior = -0.12062798778861475,
-                               unseen = -4.736198448394496,
+                     ClassData{prior = -0.1590646946296874, unseen = -4.442651256490317,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersectintersect2", -4.034240638152395),
-                                    ("at <time-of-day>named-day", -4.034240638152395),
-                                    ("intersect by \",\"year", -4.034240638152395),
-                                    ("at <time-of-day>intersect2", -4.034240638152395),
-                                    ("hh:mmintersect by \",\"", -4.034240638152395),
-                                    ("dayday", -2.32949254591397),
-                                    ("hh:mmnamed-day", -4.034240638152395),
-                                    ("intersect2intersect2", -4.034240638152395),
-                                    ("named-dayintersect by \",\"", -3.34109345759245),
-                                    ("dayyear", -2.9356283494842854),
+                                   [("at <time-of-day>named-day", -3.7376696182833684),
+                                    ("intersect by \",\"year", -3.7376696182833684),
+                                    ("hh:mmintersect by \",\"", -3.7376696182833684),
+                                    ("dayday", -2.032921526044943),
+                                    ("hh:mmnamed-day", -3.7376696182833684),
+                                    ("named-dayintersect by \",\"", -3.332204510175204),
+                                    ("dayyear", -2.8213788864092133),
                                     ("<named-month> <day-of-month> (non ordinal)intersect",
-                                     -4.034240638152395),
-                                    ("<named-month> <day-of-month> (non ordinal)intersect2",
-                                     -4.034240638152395),
+                                     -3.7376696182833684),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -3.628775530044231),
+                                     -3.332204510175204),
                                     ("<named-month> <day-of-month> (non ordinal)named-day",
-                                     -4.034240638152395),
+                                     -3.7376696182833684),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -3.34109345759245),
+                                     -3.044522437723423),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -2.9356283494842854),
-                                    ("hh:mmintersect", -4.034240638152395),
-                                    ("intersect by \",\"intersect", -4.034240638152395),
-                                    ("named-dayintersect", -4.034240638152395),
-                                    ("at <time-of-day>intersect", -4.034240638152395),
-                                    ("dayminute", -2.1624384612508036),
-                                    ("intersect2intersect", -4.034240638152395),
-                                    ("intersectyear", -4.034240638152395),
-                                    ("minuteday", -2.1624384612508036),
-                                    ("hh:mmintersect2", -4.034240638152395),
-                                    ("hh:mmabsorption of , after named day", -4.034240638152395),
-                                    ("named-dayintersect2", -4.034240638152395),
-                                    ("intersect by \",\"intersect2", -4.034240638152395),
-                                    ("at <time-of-day>intersect by \",\"", -4.034240638152395),
+                                     -2.639057329615259),
+                                    ("hh:mmintersect", -3.7376696182833684),
+                                    ("intersect by \",\"intersect", -3.7376696182833684),
+                                    ("named-dayintersect", -3.7376696182833684),
+                                    ("at <time-of-day>intersect", -3.7376696182833684),
+                                    ("dayminute", -2.639057329615259),
+                                    ("intersectyear", -3.7376696182833684),
+                                    ("minuteday", -2.032921526044943),
+                                    ("hh:mmabsorption of , after named day", -3.7376696182833684),
+                                    ("at <time-of-day>intersect by \",\"", -3.7376696182833684),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -4.034240638152395),
-                                    ("intersectintersect", -4.034240638152395),
-                                    ("intersect2year", -4.034240638152395),
+                                     -3.7376696182833684),
+                                    ("intersectintersect", -3.7376696182833684),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -3.628775530044231)],
-                               n = 39},
+                                     -3.332204510175204)],
+                               n = 29},
                    koData =
-                     ClassData{prior = -2.174751721484161, unseen = -3.828641396489095,
+                     ClassData{prior = -1.916922612182061, unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -2.0149030205422647),
-                                    ("daymonth", -2.0149030205422647)],
+                                   [("named-daynamed-month", -1.791759469228055),
+                                    ("daymonth", -1.791759469228055)],
                                n = 5}}),
        ("hh:mm",
         Classifier{okData =
@@ -1232,27 +1062,26 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.332204510175204,
+                     ClassData{prior = -1.0116009116784799,
+                               unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.6863989535702288),
-                                    ("daymonth", -1.0986122886681098),
-                                    ("named-daylast <cycle>", -2.6026896854443837),
-                                    ("named-daynext <cycle>", -2.6026896854443837),
-                                    ("named-dayintersect", -2.1972245773362196),
-                                    ("named-dayintersect2", -2.1972245773362196),
-                                    ("dayweek", -2.1972245773362196)],
-                               n = 10},
+                                   [("named-daynamed-month", -1.4816045409242156),
+                                    ("daymonth", -1.1451323043030026),
+                                    ("named-daylast <cycle>", -2.3978952727983707),
+                                    ("named-daynext <cycle>", -2.3978952727983707),
+                                    ("named-dayintersect", -1.9924301646902063),
+                                    ("dayweek", -1.9924301646902063)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.871201010907891,
+                     ClassData{prior = -0.45198512374305727,
+                               unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.6529230243738393),
-                                    ("daymonth", -0.8056251639866356),
-                                    ("named-dayintersect", -1.9042374526547454),
-                                    ("named-dayintersect2", -1.9042374526547454)],
-                               n = 20}}),
+                                   [("named-daynamed-month", -1.329135947279942),
+                                    ("daymonth", -0.8183103235139514),
+                                    ("named-dayintersect", -1.580450375560848)],
+                               n = 14}}),
        ("<duration> ago",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.5553480614894135,
@@ -1313,22 +1142,21 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("until <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -0.2876820724517809, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>", -0.9444616088408514),
-                                    ("hour", -0.9444616088408514)],
+                                   [("at <time-of-day>", -0.8873031950009028),
+                                    ("hour", -0.8873031950009028)],
                                n = 6},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906,
+                               unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -1.791759469228055),
-                                    ("intersect", -1.791759469228055),
-                                    ("hh:mm", -1.791759469228055), ("minute", -1.0986122886681098)],
-                               n = 3}}),
+                                   [("intersect", -1.5040773967762742),
+                                    ("hh:mm", -1.5040773967762742),
+                                    ("minute", -1.0986122886681098)],
+                               n = 2}}),
        ("<integer> and an half hours",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -1469,35 +1297,35 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.9903987040278769, unseen = -3.713572066704308,
+                     ClassData{prior = -0.8362480242006186,
+                               unseen = -3.6888794541139363,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.491654876777717),
-                                    ("hh:mmhh:mm", -1.491654876777717),
-                                    ("dayday", -1.8971199848858813),
+                                   [("minuteminute", -1.466337068793427),
+                                    ("hh:mmhh:mm", -1.466337068793427),
+                                    ("dayday", -1.8718021769015913),
                                     ("<day-of-month> (non ordinal) <named-month><day-of-month> (non ordinal) <named-month>",
-                                     -1.8971199848858813)],
+                                     -1.8718021769015913)],
                                n = 13},
                    koData =
-                     ClassData{prior = -0.46430560813109784, unseen = -4.07753744390572,
+                     ClassData{prior = -0.5679840376059393, unseen = -3.871201010907891,
                                likelihoods =
                                  HashMap.fromList
-                                   [("monthday", -2.268683541318364),
-                                    ("minuteminute", -1.575536360758419),
-                                    ("hh:mmhh:mm", -3.367295829986474),
-                                    ("dayyear", -2.9618307218783095),
+                                   [("monthday", -2.0583881324820035),
+                                    ("minuteminute", -1.9042374526547454),
+                                    ("hh:mmhh:mm", -3.1570004211501135),
+                                    ("dayyear", -2.751535313041949),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -2.9618307218783095),
-                                    ("hh:mmintersect", -2.268683541318364),
-                                    ("hh:mmintersect2", -2.268683541318364),
-                                    ("dd/mmyear", -2.9618307218783095),
+                                     -2.751535313041949),
+                                    ("hh:mmintersect", -2.0583881324820035),
+                                    ("dd/mmyear", -2.751535313041949),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -2.268683541318364),
+                                     -2.0583881324820035),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -2.9618307218783095),
-                                    ("minuteyear", -2.9618307218783095),
-                                    ("yearminute", -2.9618307218783095)],
-                               n = 22}}),
+                                     -2.751535313041949),
+                                    ("minuteyear", -2.751535313041949),
+                                    ("yearminute", -2.751535313041949)],
+                               n = 17}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
                      ClassData{prior = -0.8109302162163288, unseen = -3.044522437723423,
@@ -1622,20 +1450,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("last <cycle> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4965075614664802,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.5198257537444133),
-                                    ("week (grain)named-month", -2.367123614131617),
-                                    ("day (grain)intersect", -2.367123614131617),
-                                    ("day (grain)intersect2", -2.367123614131617),
-                                    ("weekmonth", -1.5198257537444133),
-                                    ("day (grain)named-month", -2.367123614131617),
-                                    ("week (grain)intersect", -2.367123614131617),
-                                    ("week (grain)intersect2", -2.367123614131617)],
-                               n = 12},
+                                   [("daymonth", -1.4816045409242156),
+                                    ("week (grain)named-month", -1.9924301646902063),
+                                    ("day (grain)intersect", -1.9924301646902063),
+                                    ("weekmonth", -1.4816045409242156),
+                                    ("day (grain)named-month", -1.9924301646902063),
+                                    ("week (grain)intersect", -1.9924301646902063)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month>(ordinal) <named-month> year",
         Classifier{okData =
@@ -1667,27 +1493,25 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("after <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.6418538861723948,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -0.7537718023763802, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.367123614131617),
-                                    ("at <time-of-day>", -1.8562979903656263),
-                                    ("intersect", -2.367123614131617),
-                                    ("tomorrow", -2.367123614131617), ("day", -2.367123614131617),
-                                    ("hour", -1.2685113254635072)],
-                               n = 10},
+                                   [("at <time-of-day>", -1.6863989535702288),
+                                    ("intersect", -2.1972245773362196),
+                                    ("tomorrow", -2.1972245773362196), ("day", -2.1972245773362196),
+                                    ("hour", -1.349926716949016)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.7472144018302211,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6359887667199967,
+                               unseen = -3.4011973816621555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this <part-of-day>", -2.3025850929940455),
-                                    ("christmas eve", -2.3025850929940455),
-                                    ("in|during the <part-of-day>", -2.3025850929940455),
-                                    ("day", -2.3025850929940455), ("hh:mm", -2.70805020110221),
-                                    ("hour", -1.455287232606842), ("minute", -2.70805020110221),
-                                    ("this <time>", -2.3025850929940455)],
+                                   [("this <part-of-day>", -2.268683541318364),
+                                    ("christmas eve", -2.268683541318364),
+                                    ("in|during the <part-of-day>", -2.268683541318364),
+                                    ("day", -2.268683541318364), ("hh:mm", -2.6741486494265287),
+                                    ("hour", -1.4213856809311607), ("minute", -2.6741486494265287),
+                                    ("this <time>", -2.268683541318364)],
                                n = 9}}),
        ("day (grain)",
         Classifier{okData =
@@ -1732,33 +1556,30 @@ classifiers
                                n = 9}}),
        ("this <time>",
         Classifier{okData =
-                     ClassData{prior = -1.4294665329850993,
-                               unseen = -3.8501476017100584,
+                     ClassData{prior = -1.3350010667323402,
+                               unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.1354942159291497),
-                                    ("intersect2", -2.7300291078209855),
-                                    ("intersect", -2.7300291078209855),
-                                    ("season", -2.2192034840549946),
-                                    ("next <cycle>", -3.1354942159291497),
-                                    ("named-month", -2.7300291078209855),
-                                    ("day", -2.2192034840549946), ("hour", -1.8827312474337816),
-                                    ("evening", -3.1354942159291497),
-                                    ("month", -1.8827312474337816),
-                                    ("morning", -3.1354942159291497),
-                                    ("week-end", -2.2192034840549946)],
-                               n = 17},
+                                   [("week", -3.0204248861443626),
+                                    ("intersect", -2.6149597780361984),
+                                    ("season", -2.1041341542702074),
+                                    ("next <cycle>", -3.0204248861443626),
+                                    ("named-month", -2.6149597780361984),
+                                    ("day", -2.1041341542702074), ("hour", -1.7676619176489945),
+                                    ("evening", -3.0204248861443626),
+                                    ("month", -2.1041341542702074),
+                                    ("morning", -3.0204248861443626),
+                                    ("week-end", -2.1041341542702074)],
+                               n = 15},
                    koData =
-                     ClassData{prior = -0.27369583047704105,
-                               unseen = -4.795790545596741,
+                     ClassData{prior = -0.3053816495511819, unseen = -4.564348191467836,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.222542385320509),
-                                    ("intersect", -2.222542385320509),
-                                    ("named-month", -1.8430527636156055),
-                                    ("hour", -2.222542385320509), ("month", -1.0262916270884836),
-                                    ("morning", -2.222542385320509)],
-                               n = 54}}),
+                                   [("intersect", -1.988927534139004),
+                                    ("named-month", -1.6094379124341003),
+                                    ("hour", -1.988927534139004), ("month", -1.1198896871153945),
+                                    ("morning", -1.988927534139004)],
+                               n = 42}}),
        ("within <duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
diff --git a/Duckling/Ranking/Classifiers/PT.hs b/Duckling/Ranking/Classifiers/PT.hs
index e6b2fd39..f95dcbfe 100644
--- a/Duckling/Ranking/Classifiers/PT.hs
+++ b/Duckling/Ranking/Classifiers/PT.hs
@@ -157,167 +157,61 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("intersect2",
-        Classifier{okData =
-                     ClassData{prior = -0.3930425881096072,
-                               unseen = -5.1298987149230735,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("<day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.02535169073515),
-                                    ("dayhour", -2.4849066497880004),
-                                    ("<day-of-month> de <named-month>two time tokens separated by \",\"2",
-                                     -4.430816798843313),
-                                    ("nowquinze para as <hour-of-day> (as relative minutes)",
-                                     -4.430816798843313),
-                                    ("intersectnamed-day", -4.430816798843313),
-                                    ("now\224s <time-of-day>", -4.02535169073515),
-                                    ("<day-of-month> de <named-month>intersect",
-                                     -4.430816798843313),
-                                    ("now<hour-of-day> and 3/4", -4.430816798843313),
-                                    ("<day-of-month> de <named-month>intersect2",
-                                     -4.430816798843313),
-                                    ("intersect by `da` or `de`named-day", -4.430816798843313),
-                                    ("intersect2named-day", -4.430816798843313),
-                                    ("<day-of-month> de <named-month>two time tokens separated by \",\"",
-                                     -4.430816798843313),
-                                    ("dayday", -2.639057329615259),
-                                    ("hourhour", -4.430816798843313),
-                                    ("named-day\224s <time-of-day>", -4.430816798843313),
-                                    ("dayyear", -2.3513752571634776),
-                                    ("minutehour", -3.1780538303479458),
-                                    ("<hour-of-day> and quinzein the <part-of-day>",
-                                     -4.02535169073515),
-                                    ("de <year>named-day", -4.430816798843313),
-                                    ("now<hour-of-day> and <relative minutes>", -4.430816798843313),
-                                    ("named-dayin the <part-of-day>", -4.430816798843313),
-                                    ("tomorrow<time-of-day> horas", -4.02535169073515),
-                                    ("now<integer> para as <hour-of-day> (as relative minutes)",
-                                     -4.430816798843313),
-                                    ("\224s <time-of-day>in the <part-of-day>",
-                                     -3.7376696182833684),
-                                    ("named-dayintersect", -4.430816798843313),
-                                    ("named-dayamanh\227 pela <part-of-day>", -4.430816798843313),
-                                    ("dayminute", -3.1780538303479458),
-                                    ("named-dayintersect2", -4.430816798843313),
-                                    ("named-dayintersect by `da` or `de`", -4.430816798843313),
-                                    ("yearnamed-day", -4.430816798843313),
-                                    ("dd-dd <month>(interval)de <year>", -4.430816798843313),
-                                    ("named-day<day-of-month> de <named-month>",
-                                     -4.430816798843313),
-                                    ("named-day<time-of-day> <part-of-day>", -4.430816798843313),
-                                    ("dia <day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.02535169073515),
-                                    ("yearday", -4.02535169073515),
-                                    ("named-day<dim time> da manha", -4.430816798843313),
-                                    ("two time tokens separated by \",\"de <year>",
-                                     -4.02535169073515),
-                                    ("intersect2de <year>", -4.430816798843313),
-                                    ("dd[/-]mmyear", -4.430816798843313),
-                                    ("<day-of-month> de <named-month>de <year>",
-                                     -3.044522437723423),
-                                    ("tomorrowdepois das <time-of-day>", -4.02535169073515),
-                                    ("<hour-of-day> and <relative minutes>in the <part-of-day>",
-                                     -4.02535169073515),
-                                    ("two time tokens separated by \",\"2de <year>",
-                                     -4.02535169073515),
-                                    ("intersectde <year>", -4.430816798843313)],
-                               n = 54},
-                   koData =
-                     ClassData{prior = -1.1239300966523995, unseen = -4.727387818712341,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -3.619886582626985),
-                                    ("monthday", -2.639057329615259),
-                                    ("named-month\224s <time-of-day>", -4.02535169073515),
-                                    ("monthyear", -2.521274293958875),
-                                    ("intersectnamed-day", -4.02535169073515),
-                                    ("now\224s <time-of-day>", -3.619886582626985),
-                                    ("intersect by `da` or `de`named-day", -4.02535169073515),
-                                    ("intersect2named-day", -4.02535169073515),
-                                    ("monthhour", -3.332204510175204),
-                                    ("dayyear", -4.02535169073515),
-                                    ("now<hour-of-day> and <relative minutes>", -4.02535169073515),
-                                    ("daysecond", -4.02535169073515),
-                                    ("named-dayright now", -4.02535169073515),
-                                    ("dayminute", -3.619886582626985),
-                                    ("named-monthde <year>", -2.521274293958875),
-                                    ("named-monthin the <part-of-day>", -3.619886582626985),
-                                    ("named-monthtwo time tokens separated by \",\"2",
-                                     -4.02535169073515),
-                                    ("intersect by `da` or `de`de <year>", -4.02535169073515),
-                                    ("named-monthintersect", -4.02535169073515),
-                                    ("<day-of-month> de <named-month>\224s <time-of-day>",
-                                     -4.02535169073515),
-                                    ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.02535169073515),
-                                    ("<day-of-month> de <named-month>de <year>", -4.02535169073515),
-                                    ("named-monthintersect2", -4.02535169073515),
-                                    ("minuteyear", -3.619886582626985),
-                                    ("named-monthtwo time tokens separated by \",\"",
-                                     -4.02535169073515)],
-                               n = 26}}),
        ("intersect by `da` or `de`",
         Classifier{okData =
-                     ClassData{prior = -0.6486954179891115, unseen = -4.418840607796598,
+                     ClassData{prior = -0.6443570163905132, unseen = -4.31748811353631,
                                likelihoods =
                                  HashMap.fromList
-                                   [("day of month (1st)named-month", -3.3081069585961433),
-                                    ("daymonth", -3.3081069585961433),
+                                   [("day of month (1st)named-month", -3.20545280453606),
+                                    ("daymonth", -3.20545280453606),
                                     ("<day-of-month> de <named-month>two time tokens separated by \",\"2",
-                                     -3.713572066704308),
+                                     -3.6109179126442243),
                                     ("<day-of-month> de <named-month>intersect",
-                                     -3.713572066704308),
-                                    ("<day-of-month> de <named-month>intersect2",
-                                     -3.713572066704308),
+                                     -3.6109179126442243),
                                     ("<day-of-month> de <named-month>two time tokens separated by \",\"",
-                                     -3.713572066704308),
-                                    ("dayday", -2.797281334830153), ("dayyear", -1.698669046162043),
-                                    ("named-dayproximo <cycle> ", -3.713572066704308),
-                                    ("dd-dd <month>(interval)year", -3.713572066704308),
-                                    ("named-day<cycle> (que vem)", -3.713572066704308),
-                                    ("two time tokens separated by \",\"2year",
-                                     -3.3081069585961433),
-                                    ("intersectyear", -3.713572066704308),
-                                    ("<day-of-month> de <named-month>year", -2.327277705584417),
-                                    ("two time tokens separated by \",\"year", -3.3081069585961433),
-                                    ("dayweek", -3.0204248861443626),
-                                    ("intersect2year", -3.713572066704308),
-                                    ("named-day<cycle> passado", -3.713572066704308)],
-                               n = 23},
+                                     -3.6109179126442243),
+                                    ("dayday", -2.917770732084279),
+                                    ("dayyear", -1.6650077635889111),
+                                    ("named-dayproximo <cycle> ", -3.6109179126442243),
+                                    ("dd-dd <month>(interval)year", -3.6109179126442243),
+                                    ("named-day<cycle> (que vem)", -3.6109179126442243),
+                                    ("two time tokens separated by \",\"2year", -3.20545280453606),
+                                    ("intersectyear", -3.6109179126442243),
+                                    ("<day-of-month> de <named-month>year", -2.2246235515243336),
+                                    ("two time tokens separated by \",\"year", -3.20545280453606),
+                                    ("dayweek", -2.917770732084279),
+                                    ("named-day<cycle> passado", -3.6109179126442243)],
+                               n = 21},
                    koData =
-                     ClassData{prior = -0.7396671961948381,
-                               unseen = -4.3694478524670215,
+                     ClassData{prior = -0.7444404749474959,
+                               unseen = -4.2626798770413155,
                                likelihoods =
                                  HashMap.fromList
                                    [("<hour-of-day> <integer> (as relative minutes)intersect",
-                                     -3.6635616461296463),
-                                    ("monthday", -2.7472709142554916),
-                                    ("monthyear", -2.159484249353372),
-                                    ("hourmonth", -3.258096538021482),
-                                    ("monthmonth", -3.6635616461296463),
-                                    ("dayyear", -3.6635616461296463),
-                                    ("<hour-of-day> <integer> (as relative minutes)intersect2",
-                                     -3.6635616461296463),
-                                    ("minutemonth", -2.7472709142554916),
-                                    ("named-monthyear", -2.159484249353372),
+                                     -3.5553480614894135),
+                                    ("monthday", -2.8622008809294686),
+                                    ("monthyear", -2.05127066471314),
+                                    ("hourmonth", -3.1498829533812494),
+                                    ("monthmonth", -3.5553480614894135),
+                                    ("dayyear", -3.5553480614894135),
+                                    ("minutemonth", -2.8622008809294686),
+                                    ("named-monthyear", -2.05127066471314),
                                     ("de <datetime> - <datetime> (interval)named-month",
-                                     -3.6635616461296463),
-                                    ("\224s <time-of-day>named-month", -3.258096538021482),
+                                     -3.5553480614894135),
+                                    ("\224s <time-of-day>named-month", -3.1498829533812494),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -3.6635616461296463),
-                                    ("<day-of-month> de <named-month>year", -3.6635616461296463),
-                                    ("intersect by `da` or `de`year", -3.6635616461296463),
+                                     -3.5553480614894135),
+                                    ("<day-of-month> de <named-month>year", -3.5553480614894135),
+                                    ("intersect by `da` or `de`year", -3.5553480614894135),
                                     ("named-monthtwo time tokens separated by \",\"2",
-                                     -3.6635616461296463),
-                                    ("named-monthintersect", -3.6635616461296463),
+                                     -3.5553480614894135),
+                                    ("named-monthintersect", -3.5553480614894135),
                                     ("<hour-of-day> <integer> (as relative minutes)intersect by `da` or `de`",
-                                     -3.6635616461296463),
-                                    ("named-monthintersect2", -3.6635616461296463),
-                                    ("minuteyear", -3.6635616461296463),
+                                     -3.5553480614894135),
+                                    ("minuteyear", -3.5553480614894135),
                                     ("named-monthtwo time tokens separated by \",\"",
-                                     -3.6635616461296463)],
-                               n = 21}}),
+                                     -3.5553480614894135)],
+                               n = 19}}),
        ("<hour-of-day> and half",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -339,32 +233,29 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("two time tokens separated by \",\"",
         Classifier{okData =
-                     ClassData{prior = -0.1941560144409575, unseen = -3.713572066704308,
+                     ClassData{prior = -0.1670540846631662,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersectnamed-day", -2.995732273553991),
-                                    ("intersect by `da` or `de`named-day", -2.995732273553991),
-                                    ("intersect2named-day", -2.995732273553991),
-                                    ("dayday", -1.1239300966523995),
-                                    ("de <year>named-day", -2.995732273553991),
-                                    ("named-dayintersect", -2.5902671654458267),
-                                    ("named-dayintersect2", -2.5902671654458267),
-                                    ("named-dayintersect by `da` or `de`", -2.5902671654458267),
-                                    ("yearnamed-day", -2.995732273553991),
+                                   [("intersectnamed-day", -2.772588722239781),
+                                    ("intersect by `da` or `de`named-day", -2.772588722239781),
+                                    ("dayday", -1.1631508098056809),
+                                    ("de <year>named-day", -2.772588722239781),
+                                    ("named-dayintersect", -2.367123614131617),
+                                    ("named-dayintersect by `da` or `de`", -2.367123614131617),
+                                    ("yearnamed-day", -2.772588722239781),
                                     ("named-day<day-of-month> de <named-month>",
-                                     -2.3025850929940455),
-                                    ("yearday", -2.5902671654458267)],
-                               n = 14},
+                                     -2.0794415416798357),
+                                    ("yearday", -2.367123614131617)],
+                               n = 11},
                    koData =
-                     ClassData{prior = -1.7346010553881064,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.8718021769015913, unseen = -2.70805020110221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("monthday", -1.5040773967762742),
-                                    ("intersectnamed-day", -2.1972245773362196),
-                                    ("intersect by `da` or `de`named-day", -2.1972245773362196),
-                                    ("intersect2named-day", -2.1972245773362196)],
-                               n = 3}}),
+                                   [("monthday", -1.540445040947149),
+                                    ("intersectnamed-day", -1.9459101490553135),
+                                    ("intersect by `da` or `de`named-day", -1.9459101490553135)],
+                               n = 2}}),
        ("ordinals (primeiro..10)",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -391,41 +282,41 @@ classifiers
                                n = 2}}),
        ("<time-of-day> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.325422400434628, unseen = -4.61512051684126,
+                     ClassData{prior = -0.33270575382573614,
+                               unseen = -4.584967478670572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<hour-of-day> and quinzeafternoon", -2.995732273553991),
-                                    ("<day-of-month> de <named-month>morning", -3.912023005428146),
-                                    ("dayhour", -3.506557897319982),
-                                    ("\224s <time-of-day>morning", -3.2188758248682006),
-                                    ("hourhour", -1.7719568419318752),
-                                    ("<hour-of-day> and halfafternoon", -2.995732273553991),
-                                    ("minutehour", -1.5141277326297755),
-                                    ("time-of-day (latent)morning", -3.2188758248682006),
-                                    ("time-of-day (latent)evening", -3.506557897319982),
-                                    ("\224s <time-of-day>afternoon", -2.3025850929940455),
+                                   [("<hour-of-day> and quinzeafternoon", -2.9652730660692823),
+                                    ("<day-of-month> de <named-month>morning", -3.8815637979434374),
+                                    ("dayhour", -3.4760986898352733),
+                                    ("\224s <time-of-day>morning", -3.188416617383492),
+                                    ("hourhour", -1.8021222562636017),
+                                    ("<hour-of-day> and halfafternoon", -2.9652730660692823),
+                                    ("minutehour", -1.483668525145067),
+                                    ("time-of-day (latent)morning", -3.188416617383492),
+                                    ("time-of-day (latent)evening", -3.4760986898352733),
+                                    ("\224s <time-of-day>afternoon", -2.2721258855093374),
                                     ("dia <day-of-month> de <named-month>morning",
-                                     -3.912023005428146),
-                                    ("time-of-day (latent)afternoon", -3.506557897319982),
+                                     -3.8815637979434374),
+                                    ("time-of-day (latent)afternoon", -3.4760986898352733),
                                     ("<hour-of-day> and <relative minutes>afternoon",
-                                     -2.659260036932778),
-                                    ("intersectmorning", -3.912023005428146),
-                                    ("\224s <time-of-day>evening", -3.506557897319982),
-                                    ("intersect2morning", -3.912023005428146)],
-                               n = 39},
+                                     -2.62880082944807),
+                                    ("intersectmorning", -3.8815637979434374),
+                                    ("\224s <time-of-day>evening", -3.4760986898352733)],
+                               n = 38},
                    koData =
-                     ClassData{prior = -1.2809338454620642, unseen = -3.970291913552122,
+                     ClassData{prior = -1.262241712449912, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -1.466337068793427),
-                                    ("monthhour", -3.258096538021482),
-                                    ("hourhour", -2.5649493574615367),
-                                    ("time-of-day (latent)morning", -3.258096538021482),
-                                    ("year (latent)afternoon", -2.159484249353372),
-                                    ("named-monthmorning", -3.258096538021482),
-                                    ("year (latent)evening", -2.8526314299133175),
-                                    ("time-of-day (latent)afternoon", -2.8526314299133175),
-                                    ("year (latent)morning", -2.341805806147327)],
+                                   [("yearhour", -1.4469189829363254),
+                                    ("monthhour", -3.2386784521643803),
+                                    ("hourhour", -2.5455312716044354),
+                                    ("time-of-day (latent)morning", -3.2386784521643803),
+                                    ("year (latent)afternoon", -2.1400661634962708),
+                                    ("named-monthmorning", -3.2386784521643803),
+                                    ("year (latent)evening", -2.833213344056216),
+                                    ("time-of-day (latent)afternoon", -2.833213344056216),
+                                    ("year (latent)morning", -2.322387720290225)],
                                n = 15}}),
        ("de <datetime> - <datetime> (interval)",
         Classifier{okData =
@@ -465,104 +356,98 @@ classifiers
                                n = 7}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.3930425881096072,
-                               unseen = -5.1298987149230735,
+                     ClassData{prior = -0.39204208777602373,
+                               unseen = -5.049856007249537,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.02535169073515),
-                                    ("dayhour", -2.4849066497880004),
+                                     -3.9448128282511368),
+                                    ("dayhour", -2.404367787303988),
                                     ("<day-of-month> de <named-month>two time tokens separated by \",\"2",
-                                     -4.430816798843313),
+                                     -4.350277936359301),
                                     ("nowquinze para as <hour-of-day> (as relative minutes)",
-                                     -4.430816798843313),
-                                    ("intersectnamed-day", -4.430816798843313),
-                                    ("now\224s <time-of-day>", -4.02535169073515),
+                                     -4.350277936359301),
+                                    ("intersectnamed-day", -4.350277936359301),
+                                    ("now\224s <time-of-day>", -3.9448128282511368),
                                     ("<day-of-month> de <named-month>intersect",
-                                     -4.430816798843313),
-                                    ("now<hour-of-day> and 3/4", -4.430816798843313),
-                                    ("<day-of-month> de <named-month>intersect2",
-                                     -4.430816798843313),
-                                    ("intersect by `da` or `de`named-day", -4.430816798843313),
-                                    ("intersect2named-day", -4.430816798843313),
+                                     -4.350277936359301),
+                                    ("now<hour-of-day> and 3/4", -4.350277936359301),
+                                    ("intersect by `da` or `de`named-day", -4.350277936359301),
                                     ("<day-of-month> de <named-month>two time tokens separated by \",\"",
-                                     -4.430816798843313),
-                                    ("dayday", -2.639057329615259),
-                                    ("hourhour", -4.430816798843313),
-                                    ("named-day\224s <time-of-day>", -4.430816798843313),
-                                    ("dayyear", -2.3513752571634776),
-                                    ("minutehour", -3.1780538303479458),
+                                     -4.350277936359301),
+                                    ("dayday", -2.846200539583027),
+                                    ("hourhour", -4.350277936359301),
+                                    ("named-day\224s <time-of-day>", -4.350277936359301),
+                                    ("dayyear", -2.3353749158170367),
+                                    ("minutehour", -3.0975149678639333),
                                     ("<hour-of-day> and quinzein the <part-of-day>",
-                                     -4.02535169073515),
-                                    ("de <year>named-day", -4.430816798843313),
-                                    ("now<hour-of-day> and <relative minutes>", -4.430816798843313),
-                                    ("named-dayin the <part-of-day>", -4.430816798843313),
-                                    ("tomorrow<time-of-day> horas", -4.02535169073515),
+                                     -3.9448128282511368),
+                                    ("de <year>named-day", -4.350277936359301),
+                                    ("now<hour-of-day> and <relative minutes>", -4.350277936359301),
+                                    ("named-dayin the <part-of-day>", -4.350277936359301),
+                                    ("tomorrow<time-of-day> horas", -3.9448128282511368),
                                     ("now<integer> para as <hour-of-day> (as relative minutes)",
-                                     -4.430816798843313),
-                                    ("\224s <time-of-day>in the <part-of-day>",
-                                     -3.7376696182833684),
-                                    ("named-dayintersect", -4.430816798843313),
-                                    ("named-dayamanh\227 pela <part-of-day>", -4.430816798843313),
-                                    ("dayminute", -3.1780538303479458),
-                                    ("named-dayintersect2", -4.430816798843313),
-                                    ("named-dayintersect by `da` or `de`", -4.430816798843313),
-                                    ("yearnamed-day", -4.430816798843313),
-                                    ("dd-dd <month>(interval)de <year>", -4.430816798843313),
+                                     -4.350277936359301),
+                                    ("\224s <time-of-day>in the <part-of-day>", -3.657130755799356),
+                                    ("named-dayintersect", -4.350277936359301),
+                                    ("named-dayamanh\227 pela <part-of-day>", -4.350277936359301),
+                                    ("dayminute", -3.0975149678639333),
+                                    ("named-dayintersect by `da` or `de`", -4.350277936359301),
+                                    ("yearnamed-day", -4.350277936359301),
+                                    ("dd-dd <month>(interval)de <year>", -4.350277936359301),
                                     ("named-day<day-of-month> de <named-month>",
-                                     -4.430816798843313),
-                                    ("named-day<time-of-day> <part-of-day>", -4.430816798843313),
+                                     -4.350277936359301),
+                                    ("named-day<time-of-day> <part-of-day>", -4.350277936359301),
                                     ("dia <day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.02535169073515),
-                                    ("yearday", -4.02535169073515),
-                                    ("named-day<dim time> da manha", -4.430816798843313),
+                                     -3.9448128282511368),
+                                    ("yearday", -3.9448128282511368),
+                                    ("named-day<dim time> da manha", -4.350277936359301),
                                     ("two time tokens separated by \",\"de <year>",
-                                     -4.02535169073515),
-                                    ("intersect2de <year>", -4.430816798843313),
-                                    ("dd[/-]mmyear", -4.430816798843313),
+                                     -3.9448128282511368),
+                                    ("dd[/-]mmyear", -4.350277936359301),
                                     ("<day-of-month> de <named-month>de <year>",
-                                     -3.044522437723423),
-                                    ("tomorrowdepois das <time-of-day>", -4.02535169073515),
+                                     -2.9639835752394106),
+                                    ("tomorrowdepois das <time-of-day>", -3.9448128282511368),
                                     ("<hour-of-day> and <relative minutes>in the <part-of-day>",
-                                     -4.02535169073515),
+                                     -3.9448128282511368),
                                     ("two time tokens separated by \",\"2de <year>",
-                                     -4.02535169073515),
-                                    ("intersectde <year>", -4.430816798843313)],
-                               n = 54},
+                                     -3.9448128282511368),
+                                    ("intersectde <year>", -4.350277936359301)],
+                               n = 50},
                    koData =
-                     ClassData{prior = -1.1239300966523995, unseen = -4.727387818712341,
+                     ClassData{prior = -1.126011262856224, unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -3.619886582626985),
-                                    ("monthday", -2.639057329615259),
-                                    ("named-month\224s <time-of-day>", -4.02535169073515),
-                                    ("monthyear", -2.521274293958875),
-                                    ("intersectnamed-day", -4.02535169073515),
-                                    ("now\224s <time-of-day>", -3.619886582626985),
-                                    ("intersect by `da` or `de`named-day", -4.02535169073515),
-                                    ("intersect2named-day", -4.02535169073515),
-                                    ("monthhour", -3.332204510175204),
-                                    ("dayyear", -4.02535169073515),
-                                    ("now<hour-of-day> and <relative minutes>", -4.02535169073515),
-                                    ("daysecond", -4.02535169073515),
-                                    ("named-dayright now", -4.02535169073515),
-                                    ("dayminute", -3.619886582626985),
-                                    ("named-monthde <year>", -2.521274293958875),
-                                    ("named-monthin the <part-of-day>", -3.619886582626985),
+                                   [("dayhour", -3.536116699561526),
+                                    ("monthday", -2.842969519001581),
+                                    ("named-month\224s <time-of-day>", -3.9415818076696905),
+                                    ("monthyear", -2.4375044108934163),
+                                    ("intersectnamed-day", -3.9415818076696905),
+                                    ("now\224s <time-of-day>", -3.536116699561526),
+                                    ("intersect by `da` or `de`named-day", -3.9415818076696905),
+                                    ("monthhour", -3.248434627109745),
+                                    ("dayyear", -3.9415818076696905),
+                                    ("now<hour-of-day> and <relative minutes>",
+                                     -3.9415818076696905),
+                                    ("daysecond", -3.9415818076696905),
+                                    ("named-dayright now", -3.9415818076696905),
+                                    ("dayminute", -3.536116699561526),
+                                    ("named-monthde <year>", -2.4375044108934163),
+                                    ("named-monthin the <part-of-day>", -3.536116699561526),
                                     ("named-monthtwo time tokens separated by \",\"2",
-                                     -4.02535169073515),
-                                    ("intersect by `da` or `de`de <year>", -4.02535169073515),
-                                    ("named-monthintersect", -4.02535169073515),
+                                     -3.9415818076696905),
+                                    ("intersect by `da` or `de`de <year>", -3.9415818076696905),
+                                    ("named-monthintersect", -3.9415818076696905),
                                     ("<day-of-month> de <named-month>\224s <time-of-day>",
-                                     -4.02535169073515),
+                                     -3.9415818076696905),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.02535169073515),
-                                    ("<day-of-month> de <named-month>de <year>", -4.02535169073515),
-                                    ("named-monthintersect2", -4.02535169073515),
-                                    ("minuteyear", -3.619886582626985),
+                                     -3.9415818076696905),
+                                    ("<day-of-month> de <named-month>de <year>",
+                                     -3.9415818076696905),
+                                    ("minuteyear", -3.536116699561526),
                                     ("named-monthtwo time tokens separated by \",\"",
-                                     -4.02535169073515)],
-                               n = 26}}),
+                                     -3.9415818076696905)],
+                               n = 24}}),
        ("season",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -579,32 +464,29 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("two time tokens separated by \",\"2",
         Classifier{okData =
-                     ClassData{prior = -0.1941560144409575, unseen = -3.713572066704308,
+                     ClassData{prior = -0.1670540846631662,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersectnamed-day", -2.995732273553991),
-                                    ("intersect by `da` or `de`named-day", -2.995732273553991),
-                                    ("intersect2named-day", -2.995732273553991),
-                                    ("dayday", -1.1239300966523995),
-                                    ("de <year>named-day", -2.995732273553991),
-                                    ("named-dayintersect", -2.5902671654458267),
-                                    ("named-dayintersect2", -2.5902671654458267),
-                                    ("named-dayintersect by `da` or `de`", -2.5902671654458267),
-                                    ("yearnamed-day", -2.995732273553991),
+                                   [("intersectnamed-day", -2.772588722239781),
+                                    ("intersect by `da` or `de`named-day", -2.772588722239781),
+                                    ("dayday", -1.1631508098056809),
+                                    ("de <year>named-day", -2.772588722239781),
+                                    ("named-dayintersect", -2.367123614131617),
+                                    ("named-dayintersect by `da` or `de`", -2.367123614131617),
+                                    ("yearnamed-day", -2.772588722239781),
                                     ("named-day<day-of-month> de <named-month>",
-                                     -2.3025850929940455),
-                                    ("yearday", -2.5902671654458267)],
-                               n = 14},
+                                     -2.0794415416798357),
+                                    ("yearday", -2.367123614131617)],
+                               n = 11},
                    koData =
-                     ClassData{prior = -1.7346010553881064,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.8718021769015913, unseen = -2.70805020110221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("monthday", -1.5040773967762742),
-                                    ("intersectnamed-day", -2.1972245773362196),
-                                    ("intersect by `da` or `de`named-day", -2.1972245773362196),
-                                    ("intersect2named-day", -2.1972245773362196)],
-                               n = 3}}),
+                                   [("monthday", -1.540445040947149),
+                                    ("intersectnamed-day", -1.9459101490553135),
+                                    ("intersect by `da` or `de`named-day", -1.9459101490553135)],
+                               n = 2}}),
        ("year (latent)",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
@@ -628,43 +510,44 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("amanh\227 pela <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.3117796240308415, unseen = -4.672828834461907,
+                     ClassData{prior = -0.3184537311185346,
+                               unseen = -4.6443908991413725,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<hour-of-day> and quinzeafternoon", -3.054001181677967),
-                                    ("<day-of-month> de <named-month>morning", -3.970291913552122),
-                                    ("dayhour", -3.054001181677967),
-                                    ("\224s <time-of-day>morning", -3.2771447329921766),
-                                    ("hourhour", -1.8302257500558512),
-                                    ("<hour-of-day> and halfafternoon", -3.054001181677967),
-                                    ("minutehour", -1.5723966407537513),
-                                    ("tomorrowevening", -3.970291913552122),
-                                    ("time-of-day (latent)morning", -3.2771447329921766),
-                                    ("time-of-day (latent)evening", -3.5648268054439574),
-                                    ("\224s <time-of-day>afternoon", -2.3608540011180215),
+                                   [("<hour-of-day> and quinzeafternoon", -3.0252910757955354),
+                                    ("<day-of-month> de <named-month>morning", -3.9415818076696905),
+                                    ("dayhour", -3.0252910757955354),
+                                    ("\224s <time-of-day>morning", -3.248434627109745),
+                                    ("hourhour", -1.8621402659898547),
+                                    ("<hour-of-day> and halfafternoon", -3.0252910757955354),
+                                    ("minutehour", -1.54368653487132),
+                                    ("tomorrowevening", -3.9415818076696905),
+                                    ("time-of-day (latent)morning", -3.248434627109745),
+                                    ("time-of-day (latent)evening", -3.536116699561526),
+                                    ("\224s <time-of-day>afternoon", -2.33214389523559),
                                     ("dia <day-of-month> de <named-month>morning",
-                                     -3.970291913552122),
-                                    ("yesterdayevening", -3.970291913552122),
-                                    ("time-of-day (latent)afternoon", -3.5648268054439574),
+                                     -3.9415818076696905),
+                                    ("yesterdayevening", -3.9415818076696905),
+                                    ("time-of-day (latent)afternoon", -3.536116699561526),
                                     ("<hour-of-day> and <relative minutes>afternoon",
-                                     -2.717528945056754),
-                                    ("intersectmorning", -3.970291913552122),
-                                    ("\224s <time-of-day>evening", -3.5648268054439574),
-                                    ("intersect2morning", -3.970291913552122)],
-                               n = 41},
+                                     -2.6888188391743224),
+                                    ("intersectmorning", -3.9415818076696905),
+                                    ("\224s <time-of-day>evening", -3.536116699561526)],
+                               n = 40},
                    koData =
-                     ClassData{prior = -1.3173014896329391, unseen = -4.007333185232471,
+                     ClassData{prior = -1.2992829841302609,
+                               unseen = -3.9889840465642745,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -1.5040773967762742),
-                                    ("monthhour", -3.295836866004329),
-                                    ("hourhour", -2.6026896854443837),
-                                    ("time-of-day (latent)morning", -3.295836866004329),
-                                    ("year (latent)afternoon", -2.1972245773362196),
-                                    ("named-monthmorning", -3.295836866004329),
-                                    ("year (latent)evening", -2.890371757896165),
-                                    ("time-of-day (latent)afternoon", -2.890371757896165),
-                                    ("year (latent)morning", -2.379546134130174)],
+                                   [("yearhour", -1.4853852637641216),
+                                    ("monthhour", -3.2771447329921766),
+                                    ("hourhour", -2.583997552432231),
+                                    ("time-of-day (latent)morning", -3.2771447329921766),
+                                    ("year (latent)afternoon", -2.178532444324067),
+                                    ("named-monthmorning", -3.2771447329921766),
+                                    ("year (latent)evening", -2.871679624884012),
+                                    ("time-of-day (latent)afternoon", -2.871679624884012),
+                                    ("year (latent)morning", -2.3608540011180215)],
                                n = 15}}),
        ("dentro de <duration>",
         Classifier{okData =
@@ -818,29 +701,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> da manha",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -0.5108256237659907,
+                               unseen = -3.4011973816621555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.772588722239781),
-                                    ("<day-of-month> de <named-month>", -2.772588722239781),
-                                    ("intersect", -2.772588722239781),
-                                    ("dia <day-of-month> de <named-month>", -2.772588722239781),
-                                    ("day", -2.367123614131617),
-                                    ("time-of-day (latent)", -2.0794415416798357),
-                                    ("hour", -1.2685113254635072),
-                                    ("\224s <time-of-day>", -2.0794415416798357)],
-                               n = 10},
+                                   [("<day-of-month> de <named-month>", -2.6741486494265287),
+                                    ("intersect", -2.6741486494265287),
+                                    ("dia <day-of-month> de <named-month>", -2.6741486494265287),
+                                    ("day", -2.268683541318364),
+                                    ("time-of-day (latent)", -1.9810014688665833),
+                                    ("hour", -1.2878542883066382),
+                                    ("\224s <time-of-day>", -1.9810014688665833)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.916290731874155, unseen = -3.1780538303479458,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -1.5686159179138452),
-                                    ("named-month", -2.4849066497880004),
-                                    ("time-of-day (latent)", -2.4849066497880004),
-                                    ("year", -1.5686159179138452), ("hour", -2.4849066497880004),
-                                    ("month", -2.4849066497880004)],
+                                   [("year (latent)", -1.5260563034950494),
+                                    ("named-month", -2.4423470353692043),
+                                    ("time-of-day (latent)", -2.4423470353692043),
+                                    ("year", -1.5260563034950494), ("hour", -2.4423470353692043),
+                                    ("month", -2.4423470353692043)],
                                n = 6}}),
        ("em <duration>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/SV.hs b/Duckling/Ranking/Classifiers/SV.hs
index aa5cded9..0c2d7018 100644
--- a/Duckling/Ranking/Classifiers/SV.hs
+++ b/Duckling/Ranking/Classifiers/SV.hs
@@ -64,169 +64,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("intersect2",
-        Classifier{okData =
-                     ClassData{prior = -0.4467467670814684, unseen = -6.07993319509559,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.285882774120979),
-                                    ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.285882774120979),
-                                    ("hourday", -5.384495062789089),
-                                    ("dayhour", -3.133203264182594),
-                                    ("daymonth", -2.8587664184808337),
-                                    ("monthyear", -3.369592042246824),
-                                    ("intersecthh:mm", -4.979029954680924),
-                                    ("named-daylast <cycle>", -5.384495062789089),
-                                    ("the <day-of-month> (ordinal)named-month",
-                                     -3.9982007016691985),
-                                    ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.979029954680924),
-                                    ("intersect2hh:mm", -4.979029954680924),
-                                    ("last <day-of-week> of <time>year", -5.384495062789089),
-                                    ("todayat <time-of-day>", -4.979029954680924),
-                                    ("dayday", -2.643655038863888),
-                                    ("dd/mmat <time-of-day>", -4.468204330914934),
-                                    ("intersect by \",\"hh:mm", -3.6797469705506636),
-                                    ("absorption of , after named dayintersect2",
-                                     -4.979029954680924),
-                                    ("named-day<named-month> <day-of-month> (ordinal)",
-                                     -5.384495062789089),
-                                    ("intersectnamed-month", -4.979029954680924),
-                                    ("dayyear", -3.438584913733776),
-                                    ("named-daythis <time>", -3.9982007016691985),
-                                    ("tomorrow<time-of-day> sharp", -4.979029954680924),
-                                    ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.468204330914934),
-                                    ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -4.6913478822291435),
-                                    ("absorption of , after named day<named-month> <day-of-month> (ordinal)",
-                                     -4.285882774120979),
-                                    ("named-day<time> timezone", -4.6913478822291435),
-                                    ("named-monthyear", -3.369592042246824),
-                                    ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.285882774120979),
-                                    ("on <date>named-month", -3.9982007016691985),
-                                    ("tomorrowuntil <time-of-day>", -4.979029954680924),
-                                    ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.6913478822291435),
-                                    ("intersect2named-month", -4.979029954680924),
-                                    ("after <time-of-day>at <time-of-day>", -4.979029954680924),
-                                    ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.979029954680924),
-                                    ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.384495062789089),
-                                    ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.384495062789089),
-                                    ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.979029954680924),
-                                    ("named-daynext <cycle>", -5.384495062789089),
-                                    ("named-dayintersect", -4.979029954680924),
-                                    ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.979029954680924),
-                                    ("tomorrowafter <time-of-day>", -4.979029954680924),
-                                    ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.468204330914934),
-                                    ("dayminute", -2.4941233048929243),
-                                    ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.6913478822291435),
-                                    ("<ordinal> <cycle> of <time>year", -4.979029954680924),
-                                    ("minuteday", -2.71034641336256),
-                                    ("absorption of , after named dayintersect",
-                                     -4.979029954680924),
-                                    ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.384495062789089),
-                                    ("named-dayon <date>", -4.6913478822291435),
-                                    ("named-dayat <time-of-day>", -4.979029954680924),
-                                    ("named-dayintersect2", -4.979029954680924),
-                                    ("yearhh:mm", -5.384495062789089),
-                                    ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.384495062789089),
-                                    ("absorption of , after named dayintersect by \",\"",
-                                     -4.131732094293721),
-                                    ("dd/mmyear", -4.979029954680924),
-                                    ("at <time-of-day>on <date>", -5.384495062789089),
-                                    ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.384495062789089),
-                                    ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.384495062789089),
-                                    ("dayweek", -4.131732094293721),
-                                    ("intersect by \",\"<day-of-month>(ordinal) <named-month>",
-                                     -4.979029954680924),
-                                    ("weekyear", -4.468204330914934),
-                                    ("hh:mmtomorrow", -4.6913478822291435),
-                                    ("named-day<day-of-month>(ordinal) <named-month>",
-                                     -5.384495062789089),
-                                    ("tomorrowat <time-of-day>", -4.131732094293721),
-                                    ("named-daythis <cycle>", -4.6913478822291435),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.384495062789089),
-                                    ("at <time-of-day>tomorrow", -4.979029954680924),
-                                    ("last <cycle> of <time>year", -4.468204330914934),
-                                    ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.979029954680924),
-                                    ("yearminute", -5.384495062789089)],
-                               n = 174},
-                   koData =
-                     ClassData{prior = -1.0208345876254254, unseen = -5.652489180268651,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("named-daynamed-month", -4.955827057601261),
-                                    ("dayhour", -3.2510789653628356),
-                                    ("daymonth", -1.9354021714568983),
-                                    ("monthday", -3.4517496608249867),
-                                    ("monthyear", -4.039536325727106),
-                                    ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.857214768933151),
-                                    ("hourmonth", -4.2626798770413155),
-                                    ("named-dayhh:mm", -4.955827057601261),
-                                    ("dayday", -4.550361949493096),
-                                    ("dd/mmat <time-of-day>", -4.039536325727106),
-                                    ("intersectnamed-month", -4.550361949493096),
-                                    ("dayyear", -3.56953269648137),
-                                    ("named-daythis <time>", -2.7045352589947655),
-                                    ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.550361949493096),
-                                    ("minutemonth", -4.550361949493096),
-                                    ("named-monthyear", -4.039536325727106),
-                                    ("on <date>named-month", -4.550361949493096),
-                                    ("absorption of , after named daynamed-month",
-                                     -3.857214768933151),
-                                    ("intersect2named-month", -4.550361949493096),
-                                    ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -3.703064089105893),
-                                    ("named-dayintersect", -4.550361949493096),
-                                    ("named-month<day-of-month>(ordinal) <named-month>",
-                                     -4.039536325727106),
-                                    ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.550361949493096),
-                                    ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.955827057601261),
-                                    ("yearmonth", -4.955827057601261),
-                                    ("until <time-of-day>on <date>", -4.955827057601261),
-                                    ("<named-month> <day-of-month> (ordinal)named-month",
-                                     -4.039536325727106),
-                                    ("dayminute", -3.3463891451671604),
-                                    ("minuteday", -3.4517496608249867),
-                                    ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.955827057601261),
-                                    ("named-dayon <date>", -4.550361949493096),
-                                    ("named-dayat <time-of-day>", -4.039536325727106),
-                                    ("named-dayintersect2", -4.550361949493096),
-                                    ("hh:mmon <date>", -3.56953269648137),
-                                    ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.550361949493096),
-                                    ("<day-of-month>(ordinal) <named-month> yearnamed-month",
-                                     -4.039536325727106),
-                                    ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.039536325727106),
-                                    ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.039536325727106),
-                                    ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.550361949493096),
-                                    ("minuteyear", -4.550361949493096),
-                                    ("yearminute", -4.550361949493096)],
-                               n = 98}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -357,25 +194,23 @@ classifiers
                                n = 2}}),
        ("between <datetime> and <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.252762968495368, unseen = -2.4849066497880004,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.3862943611198906)],
+                                   [("minuteminute", -1.2992829841302609),
+                                    ("hh:mmhh:mm", -1.2992829841302609)],
                                n = 2},
                    koData =
-                     ClassData{prior = -0.2876820724517809, unseen = -3.044522437723423,
+                     ClassData{prior = -0.3364722366212129, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mm<day-of-month> (ordinal)", -1.8971199848858813),
-                                    ("hh:mmtime-of-day (latent)", -1.8971199848858813),
-                                    ("minuteminute", -1.8971199848858813),
-                                    ("minutehour", -1.8971199848858813),
-                                    ("hh:mmintersect", -2.3025850929940455),
-                                    ("minuteday", -1.8971199848858813),
-                                    ("hh:mmintersect2", -2.3025850929940455)],
-                               n = 6}}),
+                                   [("hh:mm<day-of-month> (ordinal)", -1.7346010553881064),
+                                    ("hh:mmtime-of-day (latent)", -1.7346010553881064),
+                                    ("minuteminute", -2.1400661634962708),
+                                    ("minutehour", -1.7346010553881064),
+                                    ("hh:mmintersect", -2.1400661634962708),
+                                    ("minuteday", -1.7346010553881064)],
+                               n = 5}}),
        ("month (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -442,185 +277,176 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.44306352166517193, unseen = -6.07993319509559,
+                     ClassData{prior = -0.4382549309311553, unseen = -6.003887067106539,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.285882774120979),
+                                     -4.209655408733095),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.285882774120979),
-                                    ("hourday", -5.384495062789089),
-                                    ("dayhour", -3.133203264182594),
-                                    ("daymonth", -2.8587664184808337),
-                                    ("monthyear", -3.369592042246824),
-                                    ("intersecthh:mm", -4.979029954680924),
-                                    ("named-daylast <cycle>", -5.384495062789089),
+                                     -4.209655408733095),
+                                    ("hourday", -5.308267697401205),
+                                    ("dayhour", -3.0569758987947098),
+                                    ("daymonth", -2.956892440237727),
+                                    ("monthyear", -3.29336467685894),
+                                    ("intersecthh:mm", -4.9028025892930405),
+                                    ("named-daylast <cycle>", -5.308267697401205),
                                     ("the <day-of-month> (ordinal)named-month",
-                                     -3.9982007016691985),
+                                     -3.9219733362813143),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.979029954680924),
-                                    ("intersect2hh:mm", -4.979029954680924),
-                                    ("last <day-of-week> of <time>year", -5.384495062789089),
-                                    ("todayat <time-of-day>", -4.979029954680924),
-                                    ("dayday", -2.643655038863888),
-                                    ("dd/mmat <time-of-day>", -4.468204330914934),
-                                    ("intersect by \",\"hh:mm", -3.6797469705506636),
-                                    ("absorption of , after named dayintersect2",
-                                     -4.979029954680924),
+                                     -4.9028025892930405),
+                                    ("last <day-of-week> of <time>year", -5.308267697401205),
+                                    ("todayat <time-of-day>", -4.9028025892930405),
+                                    ("dayday", -2.6341190479746763),
+                                    ("dd/mmat <time-of-day>", -4.39197696552705),
+                                    ("intersect by \",\"hh:mm", -3.804190300624931),
                                     ("named-day<named-month> <day-of-month> (ordinal)",
-                                     -5.384495062789089),
-                                    ("intersectnamed-month", -4.979029954680924),
-                                    ("dayyear", -3.438584913733776),
-                                    ("named-daythis <time>", -3.9982007016691985),
-                                    ("tomorrow<time-of-day> sharp", -4.979029954680924),
+                                     -5.308267697401205),
+                                    ("intersectnamed-month", -4.9028025892930405),
+                                    ("dayyear", -3.362357548345891),
+                                    ("named-daythis <time>", -4.209655408733095),
+                                    ("tomorrow<time-of-day> sharp", -4.9028025892930405),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.468204330914934),
+                                     -4.39197696552705),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -4.6913478822291435),
+                                     -4.61512051684126),
                                     ("absorption of , after named day<named-month> <day-of-month> (ordinal)",
-                                     -4.285882774120979),
-                                    ("named-day<time> timezone", -4.6913478822291435),
-                                    ("named-monthyear", -3.369592042246824),
+                                     -4.209655408733095),
+                                    ("named-day<time> timezone", -4.61512051684126),
+                                    ("named-monthyear", -3.29336467685894),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.285882774120979),
-                                    ("on <date>named-month", -3.9982007016691985),
-                                    ("tomorrowuntil <time-of-day>", -4.979029954680924),
+                                     -4.209655408733095),
+                                    ("on <date>named-month", -3.9219733362813143),
+                                    ("tomorrowuntil <time-of-day>", -4.9028025892930405),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.6913478822291435),
-                                    ("intersect2named-month", -4.979029954680924),
-                                    ("after <time-of-day>at <time-of-day>", -4.979029954680924),
+                                     -4.61512051684126),
+                                    ("after <time-of-day>at <time-of-day>", -4.9028025892930405),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.979029954680924),
+                                     -4.9028025892930405),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.384495062789089),
+                                     -5.308267697401205),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.384495062789089),
+                                     -5.308267697401205),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.979029954680924),
-                                    ("named-daynext <cycle>", -5.384495062789089),
-                                    ("named-dayintersect", -4.979029954680924),
+                                     -4.9028025892930405),
+                                    ("named-daynext <cycle>", -5.308267697401205),
+                                    ("named-dayintersect", -4.9028025892930405),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.979029954680924),
-                                    ("tomorrowafter <time-of-day>", -4.979029954680924),
+                                     -4.9028025892930405),
+                                    ("tomorrowafter <time-of-day>", -4.9028025892930405),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.468204330914934),
-                                    ("dayminute", -2.4941233048929243),
+                                     -4.39197696552705),
+                                    ("dayminute", -2.6692103677859462),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.6913478822291435),
-                                    ("<ordinal> <cycle> of <time>year", -4.979029954680924),
-                                    ("minuteday", -2.71034641336256),
+                                     -4.61512051684126),
+                                    ("<ordinal> <cycle> of <time>year", -4.9028025892930405),
+                                    ("minuteday", -2.6341190479746763),
                                     ("absorption of , after named dayintersect",
-                                     -4.979029954680924),
+                                     -4.9028025892930405),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.384495062789089),
-                                    ("named-dayon <date>", -4.6913478822291435),
-                                    ("named-dayat <time-of-day>", -4.979029954680924),
-                                    ("named-dayintersect2", -4.979029954680924),
-                                    ("yearhh:mm", -5.384495062789089),
+                                     -5.308267697401205),
+                                    ("named-dayon <date>", -4.61512051684126),
+                                    ("named-dayat <time-of-day>", -4.9028025892930405),
+                                    ("yearhh:mm", -5.308267697401205),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.384495062789089),
+                                     -5.308267697401205),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -4.131732094293721),
-                                    ("dd/mmyear", -4.979029954680924),
-                                    ("at <time-of-day>on <date>", -5.384495062789089),
+                                     -4.39197696552705),
+                                    ("dd/mmyear", -4.9028025892930405),
+                                    ("at <time-of-day>on <date>", -5.308267697401205),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.384495062789089),
+                                     -5.308267697401205),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.384495062789089),
-                                    ("dayweek", -4.131732094293721),
+                                     -5.308267697401205),
+                                    ("dayweek", -4.055504728905837),
                                     ("intersect by \",\"<day-of-month>(ordinal) <named-month>",
-                                     -4.979029954680924),
-                                    ("weekyear", -4.468204330914934),
-                                    ("hh:mmtomorrow", -4.6913478822291435),
+                                     -4.9028025892930405),
+                                    ("weekyear", -4.39197696552705),
+                                    ("hh:mmtomorrow", -4.61512051684126),
                                     ("named-day<day-of-month>(ordinal) <named-month>",
-                                     -5.384495062789089),
-                                    ("tomorrowat <time-of-day>", -4.131732094293721),
-                                    ("named-daythis <cycle>", -4.6913478822291435),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.384495062789089),
-                                    ("at <time-of-day>tomorrow", -4.979029954680924),
-                                    ("last <cycle> of <time>year", -4.468204330914934),
+                                     -5.308267697401205),
+                                    ("tomorrowat <time-of-day>", -4.055504728905837),
+                                    ("named-daythis <cycle>", -4.61512051684126),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.308267697401205),
+                                    ("at <time-of-day>tomorrow", -4.9028025892930405),
+                                    ("last <cycle> of <time>year", -4.39197696552705),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.979029954680924),
-                                    ("yearminute", -5.384495062789089)],
-                               n = 174},
+                                     -4.9028025892930405),
+                                    ("yearminute", -5.308267697401205)],
+                               n = 160},
                    koData =
-                     ClassData{prior = -1.0274078423763182, unseen = -5.645446897643238,
+                     ClassData{prior = -1.0360919316867756, unseen = -5.564520407322694,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -4.948759890378168),
-                                    ("dayhour", -3.244011798139743),
-                                    ("daymonth", -1.9283350042338059),
-                                    ("monthday", -3.4446824936018943),
-                                    ("monthyear", -4.032469158504013),
+                                   [("named-daynamed-month", -4.867534450455582),
+                                    ("dayhour", -3.258096538021482),
+                                    ("daymonth", -2.0343211063993665),
+                                    ("monthday", -3.3634570536793085),
+                                    ("monthyear", -3.951243718581427),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.8501476017100584),
-                                    ("hourmonth", -4.255612709818223),
-                                    ("named-dayhh:mm", -4.948759890378168),
-                                    ("dayday", -4.948759890378168),
-                                    ("dd/mmat <time-of-day>", -4.032469158504013),
-                                    ("intersectnamed-month", -4.543294782270004),
-                                    ("dayyear", -3.5624655292582776),
-                                    ("named-daythis <time>", -2.697468091771673),
+                                     -3.7689221617874726),
+                                    ("hourmonth", -4.462069342347418),
+                                    ("named-dayhh:mm", -4.867534450455582),
+                                    ("dayday", -4.867534450455582),
+                                    ("dd/mmat <time-of-day>", -3.951243718581427),
+                                    ("intersectnamed-month", -4.462069342347418),
+                                    ("dayyear", -3.481240089335692),
+                                    ("named-daythis <time>", -2.921624301400269),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.543294782270004),
-                                    ("minutemonth", -4.543294782270004),
-                                    ("named-monthyear", -4.032469158504013),
-                                    ("on <date>named-month", -4.543294782270004),
+                                     -4.462069342347418),
+                                    ("minutemonth", -4.462069342347418),
+                                    ("named-monthyear", -3.951243718581427),
+                                    ("on <date>named-month", -4.462069342347418),
                                     ("absorption of , after named daynamed-month",
-                                     -3.8501476017100584),
-                                    ("intersect2named-month", -4.543294782270004),
+                                     -3.7689221617874726),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -3.8501476017100584),
-                                    ("named-dayintersect", -4.543294782270004),
+                                     -3.7689221617874726),
+                                    ("named-dayintersect", -4.462069342347418),
                                     ("named-month<day-of-month>(ordinal) <named-month>",
-                                     -4.032469158504013),
+                                     -3.951243718581427),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.543294782270004),
+                                     -4.462069342347418),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.948759890378168),
-                                    ("yearmonth", -4.948759890378168),
-                                    ("until <time-of-day>on <date>", -4.948759890378168),
+                                     -4.867534450455582),
+                                    ("yearmonth", -4.867534450455582),
+                                    ("until <time-of-day>on <date>", -4.867534450455582),
                                     ("<named-month> <day-of-month> (ordinal)named-month",
-                                     -4.032469158504013),
-                                    ("dayminute", -3.339321977944068),
-                                    ("minuteday", -3.4446824936018943),
+                                     -3.951243718581427),
+                                    ("dayminute", -3.258096538021482),
+                                    ("minuteday", -3.3634570536793085),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.948759890378168),
-                                    ("named-dayon <date>", -4.543294782270004),
-                                    ("named-dayat <time-of-day>", -4.032469158504013),
-                                    ("named-dayintersect2", -4.543294782270004),
-                                    ("hh:mmon <date>", -3.5624655292582776),
+                                     -4.867534450455582),
+                                    ("named-dayon <date>", -4.462069342347418),
+                                    ("named-dayat <time-of-day>", -3.951243718581427),
+                                    ("hh:mmon <date>", -3.481240089335692),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.543294782270004),
+                                     -4.462069342347418),
                                     ("<day-of-month>(ordinal) <named-month> yearnamed-month",
-                                     -4.032469158504013),
+                                     -3.951243718581427),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.032469158504013),
+                                     -3.951243718581427),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.032469158504013),
+                                     -3.951243718581427),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.543294782270004),
-                                    ("minuteyear", -4.543294782270004),
-                                    ("yearminute", -4.543294782270004)],
-                               n = 97}}),
+                                     -4.462069342347418),
+                                    ("minuteyear", -4.462069342347418),
+                                    ("yearminute", -4.462069342347418)],
+                               n = 88}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.9924301646902063),
-                                    ("ordinals (first..31st)week (grain)intersect2",
-                                     -1.9924301646902063),
+                                   [("daymonth", -1.7346010553881064),
                                     ("ordinals (first..31st)week (grain)intersect",
-                                     -1.9924301646902063),
+                                     -1.7346010553881064),
                                     ("ordinals (first..31st)week (grain)named-month",
-                                     -1.9924301646902063),
-                                    ("weekmonth", -1.1451323043030026),
+                                     -1.7346010553881064),
+                                    ("weekmonth", -1.2237754316221157),
                                     ("ordinals (first..31st)day (grain)named-month",
-                                     -1.9924301646902063)],
-                               n = 8},
+                                     -1.7346010553881064)],
+                               n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("season",
         Classifier{okData =
@@ -638,43 +464,42 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("from <datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -1.4816045409242156,
+                               unseen = -3.4657359027997265,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.8562979903656263),
+                                   [("minuteminute", -1.824549292051046),
                                     ("time-of-day (latent)time-of-day (latent)",
-                                     -2.772588722239781),
-                                    ("hh:mmhh:mm", -1.8562979903656263),
-                                    ("hourhour", -2.772588722239781)],
+                                     -2.740840023925201),
+                                    ("hh:mmhh:mm", -1.824549292051046),
+                                    ("hourhour", -2.740840023925201)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.2231435513142097, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2578291093020998, unseen = -4.02535169073515,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.4339872044851463),
-                                    ("dayhour", -3.4339872044851463),
-                                    ("yearhour", -3.4339872044851463),
-                                    ("hh:mm<day-of-month> (ordinal)", -2.517696472610991),
+                                   [("hourday", -3.3141860046725258),
+                                    ("dayhour", -3.3141860046725258),
+                                    ("yearhour", -3.3141860046725258),
+                                    ("hh:mm<day-of-month> (ordinal)", -2.3978952727983707),
                                     ("time-of-day (latent)<day-of-month> (ordinal)",
-                                     -3.4339872044851463),
+                                     -3.3141860046725258),
                                     ("<day-of-month> (ordinal)time-of-day (latent)",
-                                     -3.4339872044851463),
-                                    ("hh:mmtime-of-day (latent)", -2.517696472610991),
-                                    ("minuteminute", -2.181224235989778),
-                                    ("yearyear", -3.4339872044851463),
+                                     -3.3141860046725258),
+                                    ("hh:mmtime-of-day (latent)", -2.3978952727983707),
+                                    ("minuteminute", -2.6210388241125804),
+                                    ("yearyear", -3.3141860046725258),
                                     ("<day-of-month> (ordinal)<day-of-month> (ordinal)",
-                                     -3.4339872044851463),
-                                    ("dayday", -3.4339872044851463),
-                                    ("year (latent)year (latent)", -3.4339872044851463),
-                                    ("minutehour", -2.517696472610991),
-                                    ("hh:mmintersect", -2.740840023925201),
-                                    ("year (latent)time-of-day (latent)", -3.4339872044851463),
-                                    ("minuteday", -2.517696472610991),
-                                    ("hh:mmintersect2", -2.740840023925201),
-                                    ("year (latent)<day-of-month> (ordinal)", -3.4339872044851463),
-                                    ("yearday", -3.4339872044851463)],
-                               n = 20}}),
+                                     -3.3141860046725258),
+                                    ("dayday", -3.3141860046725258),
+                                    ("year (latent)year (latent)", -3.3141860046725258),
+                                    ("minutehour", -2.3978952727983707),
+                                    ("hh:mmintersect", -2.6210388241125804),
+                                    ("year (latent)time-of-day (latent)", -3.3141860046725258),
+                                    ("minuteday", -2.3978952727983707),
+                                    ("year (latent)<day-of-month> (ordinal)", -3.3141860046725258),
+                                    ("yearday", -3.3141860046725258)],
+                               n = 17}}),
        ("next <cycle>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.044522437723423,
@@ -789,25 +614,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.35667494393873245,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -0.5596157879354228, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.7576857016975165),
-                                    ("ordinals (first..31st)named-dayintersect2",
-                                     -1.5198257537444133),
+                                   [("daymonth", -0.7472144018302211),
                                     ("ordinals (first..31st)named-dayintersect",
-                                     -1.5198257537444133),
+                                     -0.9985288301111273),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -2.367123614131617)],
-                               n = 14},
+                                     -1.845826690498331)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -1.2039728043259361, unseen = -2.833213344056216,
+                     ClassData{prior = -0.8472978603872037, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.8266785731844679),
+                                   [("daymonth", -0.7621400520468967),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -0.8266785731844679)],
+                                     -0.7621400520468967)],
                                n = 6}}),
        ("the <day-of-month> (non ordinal)",
         Classifier{okData =
@@ -1026,16 +848,15 @@ classifiers
                                n = 4}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.3862943611198906),
-                                    ("daymonth", -0.8754687373538999),
-                                    ("named-dayintersect", -1.791759469228055),
-                                    ("named-dayintersect2", -1.791759469228055)],
-                               n = 4},
+                                   [("named-daynamed-month", -1.0986122886681098),
+                                    ("daymonth", -0.8109302162163288),
+                                    ("named-dayintersect", -1.5040773967762742)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
@@ -1121,72 +942,60 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\"",
         Classifier{okData =
-                     ClassData{prior = -6.538275926285174e-2,
-                               unseen = -5.25227342804663,
+                     ClassData{prior = -8.855339734144506e-2,
+                               unseen = -4.948759890378168,
                                likelihoods =
                                  HashMap.fromList
                                    [("<named-month> <day-of-month> (ordinal)intersect",
-                                     -4.553876891600541),
-                                    ("intersectintersect2", -4.148411783492376),
-                                    ("at <time-of-day>named-day", -4.553876891600541),
-                                    ("intersect by \",\"year", -4.148411783492376),
-                                    ("at <time-of-day>intersect2", -4.148411783492376),
-                                    ("hh:mmintersect by \",\"", -4.148411783492376),
-                                    ("dayday", -2.202501634437063),
-                                    ("hh:mmnamed-day", -4.553876891600541),
-                                    ("intersect2intersect2", -4.148411783492376),
-                                    ("named-dayintersect by \",\"", -3.301113923105173),
+                                     -4.248495242049359),
+                                    ("at <time-of-day>named-day", -4.248495242049359),
+                                    ("intersect by \",\"year", -3.8430301339411947),
+                                    ("hh:mmintersect by \",\"", -3.8430301339411947),
+                                    ("dayday", -1.8971199848858813),
+                                    ("hh:mmnamed-day", -4.248495242049359),
+                                    ("named-dayintersect by \",\"", -3.332204510175204),
                                     ("named-day<named-month> <day-of-month> (ordinal)",
-                                     -3.455264602932431),
-                                    ("dayyear", -2.8491287993621155),
+                                     -3.1498829533812494),
+                                    ("dayyear", -2.744417845273085),
                                     ("<named-month> <day-of-month> (non ordinal)intersect",
-                                     -4.553876891600541),
-                                    ("<named-month> <day-of-month> (ordinal)intersect2",
-                                     -4.553876891600541),
-                                    ("<named-month> <day-of-month> (non ordinal)intersect2",
-                                     -4.553876891600541),
+                                     -4.248495242049359),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.148411783492376),
+                                     -3.8430301339411947),
                                     ("<named-month> <day-of-month> (non ordinal)named-day",
-                                     -4.553876891600541),
+                                     -4.248495242049359),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -3.8607297110405954),
+                                     -3.5553480614894135),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -3.455264602932431),
-                                    ("hh:mmintersect", -4.148411783492376),
-                                    ("intersect by \",\"intersect", -4.148411783492376),
-                                    ("named-dayintersect", -4.148411783492376),
-                                    ("at <time-of-day>intersect", -4.148411783492376),
-                                    ("dayminute", -2.0281482472922856),
-                                    ("intersect2intersect", -4.148411783492376),
-                                    ("intersectyear", -4.148411783492376),
-                                    ("minuteday", -2.202501634437063),
-                                    ("hh:mmintersect2", -4.148411783492376),
-                                    ("hh:mmabsorption of , after named day", -4.553876891600541),
-                                    ("named-dayintersect2", -4.148411783492376),
-                                    ("intersect by \",\"intersect2", -4.148411783492376),
-                                    ("at <time-of-day>intersect by \",\"", -4.148411783492376),
+                                     -3.1498829533812494),
+                                    ("hh:mmintersect", -3.8430301339411947),
+                                    ("intersect by \",\"intersect", -3.8430301339411947),
+                                    ("named-dayintersect", -3.8430301339411947),
+                                    ("at <time-of-day>intersect", -3.8430301339411947),
+                                    ("dayminute", -2.5437471498109336),
+                                    ("intersectyear", -3.8430301339411947),
+                                    ("minuteday", -2.108429078553088),
+                                    ("hh:mmabsorption of , after named day", -4.248495242049359),
+                                    ("at <time-of-day>intersect by \",\"", -3.8430301339411947),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -4.553876891600541),
-                                    ("intersectintersect", -4.148411783492376),
-                                    ("intersect2year", -4.148411783492376),
+                                     -4.248495242049359),
+                                    ("intersectintersect", -3.8430301339411947),
                                     ("intersect by \",\"<day-of-month>(ordinal) <named-month>",
-                                     -4.148411783492376),
+                                     -3.8430301339411947),
                                     ("named-day<day-of-month>(ordinal) <named-month>",
-                                     -3.8607297110405954),
+                                     -3.5553480614894135),
                                     ("<named-month> <day-of-month> (ordinal)named-day",
-                                     -4.553876891600541),
+                                     -4.248495242049359),
                                     ("<named-month> <day-of-month> (ordinal)year",
-                                     -4.148411783492376),
+                                     -3.8430301339411947),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -4.148411783492376)],
-                               n = 74},
+                                     -3.8430301339411947)],
+                               n = 54},
                    koData =
-                     ClassData{prior = -2.760009940032921, unseen = -3.970291913552122,
+                     ClassData{prior = -2.468099531471619, unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -2.159484249353372),
-                                    ("daymonth", -2.159484249353372)],
+                                   [("named-daynamed-month", -1.9459101490553135),
+                                    ("daymonth", -1.9459101490553135)],
                                n = 5}}),
        ("hh:mm",
         Classifier{okData =
@@ -1235,27 +1044,25 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.9555114450274363, unseen = -3.332204510175204,
+                     ClassData{prior = -0.8649974374866046,
+                               unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.6863989535702288),
-                                    ("daymonth", -1.0986122886681098),
-                                    ("named-daylast <cycle>", -2.6026896854443837),
-                                    ("named-daynext <cycle>", -2.6026896854443837),
-                                    ("named-dayintersect", -2.1972245773362196),
-                                    ("named-dayintersect2", -2.1972245773362196),
-                                    ("dayweek", -2.1972245773362196)],
-                               n = 10},
+                                   [("named-daynamed-month", -1.4816045409242156),
+                                    ("daymonth", -1.1451323043030026),
+                                    ("named-daylast <cycle>", -2.3978952727983707),
+                                    ("named-daynext <cycle>", -2.3978952727983707),
+                                    ("named-dayintersect", -1.9924301646902063),
+                                    ("dayweek", -1.9924301646902063)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.48550781578170077,
-                               unseen = -3.6888794541139363,
+                     ClassData{prior = -0.5465437063680699, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -1.717651497074333),
-                                    ("daymonth", -0.8303483020734304),
-                                    ("named-dayintersect", -1.8718021769015913),
-                                    ("named-dayintersect2", -1.8718021769015913)],
-                               n = 16}}),
+                                   [("named-daynamed-month", -1.3862943611198906),
+                                    ("daymonth", -0.8472978603872037),
+                                    ("named-dayintersect", -1.540445040947149)],
+                               n = 11}}),
        ("<duration> ago",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4965075614664802,
@@ -1324,22 +1131,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("until <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -0.2876820724517809, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>", -0.9444616088408514),
-                                    ("hour", -0.9444616088408514)],
+                                   [("at <time-of-day>", -0.8873031950009028),
+                                    ("hour", -0.8873031950009028)],
                                n = 6},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906,
+                               unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -1.791759469228055),
-                                    ("intersect", -1.791759469228055),
-                                    ("hh:mm", -1.791759469228055), ("minute", -1.0986122886681098)],
-                               n = 3}}),
+                                   [("intersect", -1.5040773967762742),
+                                    ("hh:mm", -1.5040773967762742),
+                                    ("minute", -1.0986122886681098)],
+                               n = 2}}),
        ("<integer> and an half hours",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -1480,43 +1286,42 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.6751286750572671, unseen = -4.31748811353631,
+                     ClassData{prior = -0.579818495252942, unseen = -4.304065093204169,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month>(ordinal) <named-month><day-of-month> (non ordinal) <named-month>",
-                                     -2.512305623976115),
+                                     -2.498699971920336),
                                     ("<day-of-month> (non ordinal) <named-month><day-of-month>(ordinal) <named-month>",
-                                     -2.512305623976115),
-                                    ("minuteminute", -2.10684051586795),
-                                    ("hh:mmhh:mm", -2.10684051586795),
-                                    ("dayday", -1.2595426554807467),
+                                     -2.498699971920336),
+                                    ("minuteminute", -2.093234863812172),
+                                    ("hh:mmhh:mm", -2.093234863812172),
+                                    ("dayday", -1.2459370034249682),
                                     ("<day-of-month> (non ordinal) <named-month><day-of-month> (non ordinal) <named-month>",
-                                     -2.512305623976115),
+                                     -2.498699971920336),
                                     ("<day-of-month>(ordinal) <named-month><day-of-month>(ordinal) <named-month>",
-                                     -2.512305623976115)],
+                                     -2.498699971920336)],
                                n = 28},
                    koData =
-                     ClassData{prior = -0.7114963192281418, unseen = -4.290459441148391,
+                     ClassData{prior = -0.8209805520698302, unseen = -4.127134385045092,
                                likelihoods =
                                  HashMap.fromList
-                                   [("monthday", -1.8787708462176846),
-                                    ("minuteminute", -1.791759469228055),
-                                    ("hh:mmhh:mm", -3.58351893845611),
-                                    ("dayyear", -3.1780538303479458),
+                                   [("monthday", -1.7129785913749407),
+                                    ("minuteminute", -2.164963715117998),
+                                    ("hh:mmhh:mm", -3.417726683613366),
+                                    ("dayyear", -3.012261575505202),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -3.1780538303479458),
-                                    ("hh:mmintersect", -2.4849066497880004),
+                                     -3.012261575505202),
+                                    ("hh:mmintersect", -2.3191143949452564),
                                     ("named-month<day-of-month>(ordinal) <named-month>",
-                                     -2.4849066497880004),
-                                    ("hh:mmintersect2", -2.4849066497880004),
-                                    ("dd/mmyear", -3.1780538303479458),
+                                     -2.3191143949452564),
+                                    ("dd/mmyear", -3.012261575505202),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -2.4849066497880004),
+                                     -2.3191143949452564),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -3.1780538303479458),
-                                    ("minuteyear", -3.1780538303479458),
-                                    ("yearminute", -3.1780538303479458)],
-                               n = 27}}),
+                                     -3.012261575505202),
+                                    ("minuteyear", -3.012261575505202),
+                                    ("yearminute", -3.012261575505202)],
+                               n = 22}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
                      ClassData{prior = -0.8109302162163288, unseen = -3.044522437723423,
@@ -1627,20 +1432,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("last <cycle> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4965075614664802,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.5198257537444133),
-                                    ("week (grain)named-month", -2.367123614131617),
-                                    ("day (grain)intersect", -2.367123614131617),
-                                    ("day (grain)intersect2", -2.367123614131617),
-                                    ("weekmonth", -1.5198257537444133),
-                                    ("day (grain)named-month", -2.367123614131617),
-                                    ("week (grain)intersect", -2.367123614131617),
-                                    ("week (grain)intersect2", -2.367123614131617)],
-                               n = 12},
+                                   [("daymonth", -1.4816045409242156),
+                                    ("week (grain)named-month", -1.9924301646902063),
+                                    ("day (grain)intersect", -1.9924301646902063),
+                                    ("weekmonth", -1.4816045409242156),
+                                    ("day (grain)named-month", -1.9924301646902063),
+                                    ("week (grain)intersect", -1.9924301646902063)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month>(ordinal) <named-month> year",
         Classifier{okData =
@@ -1677,28 +1480,25 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("after <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.6931471805599453,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -0.8109302162163288, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.3978952727983707),
-                                    ("at <time-of-day>", -1.8870696490323797),
-                                    ("intersect", -2.3978952727983707),
-                                    ("tomorrow", -2.3978952727983707), ("day", -2.3978952727983707),
-                                    ("hour", -1.2992829841302609)],
-                               n = 10},
+                                   [("at <time-of-day>", -1.7227665977411035),
+                                    ("intersect", -2.2335922215070942),
+                                    ("tomorrow", -2.2335922215070942), ("day", -2.2335922215070942),
+                                    ("hour", -1.3862943611198906)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.6931471805599453,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -0.587786664902119, unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("lunch", -2.803360380906535),
-                                    ("year (latent)", -2.1102132003465894),
-                                    ("day", -2.3978952727983707),
-                                    ("time-of-day (latent)", -2.1102132003465894),
-                                    ("year", -2.1102132003465894), ("hh:mm", -2.803360380906535),
-                                    ("<day-of-month> (ordinal)", -2.3978952727983707),
-                                    ("hour", -1.8870696490323797), ("minute", -2.803360380906535)],
+                                   [("lunch", -2.772588722239781),
+                                    ("year (latent)", -2.0794415416798357),
+                                    ("day", -2.367123614131617),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("year", -2.0794415416798357), ("hh:mm", -2.772588722239781),
+                                    ("<day-of-month> (ordinal)", -2.367123614131617),
+                                    ("hour", -1.8562979903656263), ("minute", -2.772588722239781)],
                                n = 10}}),
        ("day (grain)",
         Classifier{okData =
@@ -1742,33 +1542,31 @@ classifiers
                                n = 10}}),
        ("this <time>",
         Classifier{okData =
-                     ClassData{prior = -1.4039939382192916,
-                               unseen = -3.7612001156935624,
+                     ClassData{prior = -1.2992829841302609,
+                               unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.044522437723423),
-                                    ("intersect2", -2.639057329615259),
-                                    ("intersect", -2.639057329615259),
-                                    ("season", -2.128231705849268),
-                                    ("next <cycle>", -3.044522437723423),
-                                    ("named-month", -2.639057329615259),
-                                    ("day", -2.128231705849268), ("hour", -2.3513752571634776),
-                                    ("month", -1.791759469228055),
-                                    ("week-end", -2.3513752571634776)],
-                               n = 14},
+                                   [("week", -2.917770732084279), ("intersect", -2.512305623976115),
+                                    ("season", -2.001480000210124),
+                                    ("next <cycle>", -2.917770732084279),
+                                    ("named-month", -2.512305623976115),
+                                    ("day", -2.001480000210124), ("hour", -2.2246235515243336),
+                                    ("month", -2.001480000210124),
+                                    ("week-end", -2.2246235515243336)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -0.2818511521409877, unseen = -4.61512051684126,
+                     ClassData{prior = -0.3184537311185346, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.120263536200091),
-                                    ("intersect", -2.120263536200091),
-                                    ("named-month", -1.7719568419318752),
-                                    ("day", -3.912023005428146),
-                                    ("time-of-day (latent)", -3.506557897319982),
-                                    ("<day-of-month> (ordinal)", -3.912023005428146),
-                                    ("noon", -3.912023005428146), ("hour", -2.995732273553991),
-                                    ("month", -0.941608539858445), ("morning", -3.912023005428146)],
-                               n = 43}}),
+                                   [("intersect", -1.8588987720656835),
+                                    ("named-month", -1.5105920777974677),
+                                    ("day", -3.6506582412937383),
+                                    ("time-of-day (latent)", -3.245193133185574),
+                                    ("<day-of-month> (ordinal)", -3.6506582412937383),
+                                    ("noon", -3.6506582412937383), ("hour", -2.7343675094195836),
+                                    ("month", -1.0116009116784799),
+                                    ("morning", -3.6506582412937383)],
+                               n = 32}}),
        ("<named-month> <day-of-month> (ordinal)",
         Classifier{okData =
                      ClassData{prior = -0.4418327522790392, unseen = -3.044522437723423,
diff --git a/Duckling/Time/DA/Rules.hs b/Duckling/Time/DA/Rules.hs
index 0405414d..227c78bd 100644
--- a/Duckling/Time/DA/Rules.hs
+++ b/Duckling/Time/DA/Rules.hs
@@ -1050,19 +1050,6 @@ ruleIntersect = Rule
       _ -> Nothing
   }
 
-ruleIntersect2 :: Rule
-ruleIntersect2 = Rule
-  { name = "intersect2"
-  , pattern =
-    [ Predicate isNotLatent
-    , Predicate isNotLatent
-    ]
-  , prod = \tokens -> case tokens of
-      (Token Time td1:Token Time td2:_) ->
-        Just . Token Time $ intersect (td2, td1)
-      _ -> Nothing
-  }
-
 ruleAboutTimeofday :: Rule
 ruleAboutTimeofday = Rule
   { name = "about <time-of-day>"
@@ -1912,7 +1899,6 @@ rules =
   , ruleInduringThePartofday
   , ruleInduringThePartofday2
   , ruleIntersect
-  , ruleIntersect2
   , ruleIntersectBy
   , ruleIntersectByOfFromS
   , ruleLastCycle
diff --git a/Duckling/Time/EN/Rules.hs b/Duckling/Time/EN/Rules.hs
index caf45f0e..f27fc9b5 100644
--- a/Duckling/Time/EN/Rules.hs
+++ b/Duckling/Time/EN/Rules.hs
@@ -45,18 +45,6 @@ ruleIntersect = Rule
       _ -> Nothing
   }
 
-ruleIntersect2 :: Rule
-ruleIntersect2 = Rule
-  { name = "intersect2"
-  , pattern =
-    [ Predicate isNotLatent
-    , Predicate isNotLatent
-    ]
-  , prod = \tokens -> case tokens of
-      (Token Time td1:Token Time td2:_) -> Just . Token Time $ intersect (td2, td1)
-      _ -> Nothing
-  }
-
 ruleIntersectOf :: Rule
 ruleIntersectOf = Rule
   { name = "intersect by \",\", \"of\", \"from\", \"'s\""
@@ -1506,7 +1494,6 @@ ruleTimezone = Rule
 rules :: [Rule]
 rules =
   [ ruleIntersect
-  , ruleIntersect2
   , ruleIntersectOf
   , ruleAbsorbOnTime
   , ruleAbsorbOnADOW
diff --git a/Duckling/Time/NB/Rules.hs b/Duckling/Time/NB/Rules.hs
index 1f9b225e..333107ac 100644
--- a/Duckling/Time/NB/Rules.hs
+++ b/Duckling/Time/NB/Rules.hs
@@ -1022,19 +1022,6 @@ ruleIntersect = Rule
       _ -> Nothing
   }
 
-ruleIntersect2 :: Rule
-ruleIntersect2 = Rule
-  { name = "intersect2"
-  , pattern =
-    [ Predicate isNotLatent
-    , Predicate isNotLatent
-    ]
-  , prod = \tokens -> case tokens of
-      (Token Time td1:Token Time td2:_) ->
-        Just . Token Time $ intersect (td2, td1)
-      _ -> Nothing
-  }
-
 ruleAboutTimeofday :: Rule
 ruleAboutTimeofday = Rule
   { name = "about <time-of-day>"
@@ -1864,7 +1851,6 @@ rules =
   , ruleInduringThePartofday
   , ruleInduringThePartofday2
   , ruleIntersect
-  , ruleIntersect2
   , ruleIntersectBy
   , ruleIntersectByOfFromS
   , ruleLastCycle
diff --git a/Duckling/Time/PT/Rules.hs b/Duckling/Time/PT/Rules.hs
index 0e130032..f1431d26 100644
--- a/Duckling/Time/PT/Rules.hs
+++ b/Duckling/Time/PT/Rules.hs
@@ -917,19 +917,6 @@ ruleIntersect = Rule
       _ -> Nothing
   }
 
-ruleIntersect2 :: Rule
-ruleIntersect2 = Rule
-  { name = "intersect2"
-  , pattern =
-    [ Predicate isNotLatent
-    , Predicate isNotLatent
-    ]
-  , prod = \tokens -> case tokens of
-      (Token Time td1:Token Time td2:_) ->
-        Just . Token Time $ intersect (td2, td1)
-      _ -> Nothing
-  }
-
 ruleTimeofdayPartofday :: Rule
 ruleTimeofdayPartofday = Rule
   { name = "<time-of-day> <part-of-day>"
@@ -1598,7 +1585,6 @@ rules =
   , ruleQuarterParaAsHourofdayAsRelativeMinutes
   , ruleThreeQuarterParaAsHourofdayAsRelativeMinutes
   , ruleIntersect
-  , ruleIntersect2
   , ruleIntersectByDaOrDe
   , ruleLastTime
   , ruleMidnight
diff --git a/Duckling/Time/SV/Rules.hs b/Duckling/Time/SV/Rules.hs
index 2d5eaf7a..b11d93bf 100644
--- a/Duckling/Time/SV/Rules.hs
+++ b/Duckling/Time/SV/Rules.hs
@@ -1017,19 +1017,6 @@ ruleIntersect = Rule
       _ -> Nothing
   }
 
-ruleIntersect2 :: Rule
-ruleIntersect2 = Rule
-  { name = "intersect2"
-  , pattern =
-    [ Predicate isNotLatent
-    , Predicate isNotLatent
-    ]
-  , prod = \tokens -> case tokens of
-      (Token Time td1:Token Time td2:_) ->
-        Just . Token Time $ intersect (td2, td1)
-      _ -> Nothing
-  }
-
 ruleAboutTimeofday :: Rule
 ruleAboutTimeofday = Rule
   { name = "about <time-of-day>"
@@ -1834,7 +1821,6 @@ rules =
   , ruleInduringThePartofday
   , ruleInduringThePartofday2
   , ruleIntersect
-  , ruleIntersect2
   , ruleIntersectBy
   , ruleIntersectByOfFromS
   , ruleLastCycle