diff --git a/Duckling/Ranking/Classifiers/EN_AU.hs b/Duckling/Ranking/Classifiers/EN_AU.hs
index cc09b489..b81673b5 100644
--- a/Duckling/Ranking/Classifiers/EN_AU.hs
+++ b/Duckling/Ranking/Classifiers/EN_AU.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
-                                    ("Thursdaydd/mm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
+                                    ("Thursdaydd/mm", -5.995207533386816),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_BZ.hs b/Duckling/Ranking/Classifiers/EN_BZ.hs
index b554e992..0593906c 100644
--- a/Duckling/Ranking/Classifiers/EN_BZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_BZ.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
-                                    ("Thursdaydd/mm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
+                                    ("Thursdaydd/mm", -5.995207533386816),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_CA.hs b/Duckling/Ranking/Classifiers/EN_CA.hs
index 624de623..f394e046 100644
--- a/Duckling/Ranking/Classifiers/EN_CA.hs
+++ b/Duckling/Ranking/Classifiers/EN_CA.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.6125924663215397, unseen = -6.013715156042802,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 407},
+                     ClassData{prior = -0.6117212101423798, unseen = -6.049733455231958,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 422},
                    koData =
-                     ClassData{prior = -0.7807639943907364, unseen = -5.846438775057725,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 344}}),
+                     ClassData{prior = -0.7817957933263611, unseen = -5.8805329864007,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 356}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -254,7 +254,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -275,54 +275,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -381,55 +385,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -447,32 +449,32 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 19}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.14035735769492247,
-                               unseen = -5.075173815233827,
+                     ClassData{prior = -0.1466034741918754, unseen = -5.111987788356543,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.6826098411003407),
-                                    ("noon|midnight|EOD|end of day", -3.970291913552122),
-                                    ("integer after|past <hour-of-day>", -3.970291913552122),
-                                    ("half after|past <hour-of-day>", -4.375757021660286),
-                                    ("<hour-of-day> <integer>", -3.970291913552122),
-                                    ("time-of-day (latent)", -1.7366996920450277),
-                                    ("hhmm (latent)", -3.6826098411003407),
-                                    ("<time-of-day> am|pm", -1.8108076641987496),
-                                    ("hh:mm", -3.2771447329921766),
-                                    ("about|exactly <time-of-day>", -3.970291913552122),
-                                    ("hour", -1.1176604836388042),
-                                    ("<time-of-day> sharp|exactly", -4.375757021660286),
-                                    ("minute", -1.9334099862910819)],
-                               n = 73},
+                                   [("<time> timezone", -3.71965111278069),
+                                    ("noon|midnight|EOD|end of day", -4.007333185232471),
+                                    ("integer after|past <hour-of-day>", -3.71965111278069),
+                                    ("half after|past <hour-of-day>", -4.412798293340635),
+                                    ("<hour-of-day> <integer>", -3.71965111278069),
+                                    ("time-of-day (latent)", -1.7386496439141066),
+                                    ("hhmm (latent)", -3.71965111278069),
+                                    ("<time-of-day> am|pm", -1.8478489358790986),
+                                    ("hh:mm", -3.3141860046725258),
+                                    ("about|exactly <time-of-day>", -4.007333185232471),
+                                    ("hour", -1.1356535603484588),
+                                    ("<time-of-day> sharp|exactly", -4.412798293340635),
+                                    ("minute", -1.8870696490323797)],
+                               n = 76},
                    koData =
-                     ClassData{prior = -2.032921526044943, unseen = -3.58351893845611,
+                     ClassData{prior = -1.9924301646902063,
+                               unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.252762968495368),
-                                    ("<time-of-day> am|pm", -2.456735772821304),
-                                    ("hour", -1.0704414117014134)],
-                               n = 11}}),
+                                   [("time-of-day (latent)", -1.213022639845854),
+                                    ("<time-of-day> am|pm", -2.512305623976115),
+                                    ("hour", -1.0459685551826876)],
+                               n = 12}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -852,423 +854,419 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.48376595852192217,
-                               unseen = -7.055312843339752,
+                     ClassData{prior = -0.484291587675911, unseen = -7.057036981697891,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.361302477572996),
-                                    ("Father's Dayyear (latent)", -6.361302477572996),
+                                   [("Navaratriyear (latent)", -6.363028103540465),
+                                    ("Father's Dayyear (latent)", -6.363028103540465),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.361302477572996),
-                                    ("Ramadanyear (latent)", -5.4450117456988405),
+                                     -6.363028103540465),
+                                    ("Ramadanyear (latent)", -5.44673737166631),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.3463994570307305),
-                                    ("Bhai Doojyear (latent)", -6.361302477572996),
-                                    ("hourday", -4.3463994570307305),
-                                    ("dayhour", -3.416863498406555),
+                                     -4.3481250829982),
+                                    ("Bhai Doojyear (latent)", -6.363028103540465),
+                                    ("hourday", -4.3481250829982), ("dayhour", -3.4185891243740243),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.3463994570307305),
-                                    ("Martin Luther King's Dayyear (latent)", -5.955837369464831),
-                                    ("Shemini Atzeretyear (latent)", -6.361302477572996),
-                                    ("daymonth", -4.3463994570307305),
-                                    ("monthday", -5.955837369464831),
-                                    ("monthyear", -4.56954300834494),
-                                    ("Yom Ha'atzmautyear (latent)", -6.361302477572996),
-                                    ("Vijayadashamiyear (latent)", -6.361302477572996),
+                                     -4.3481250829982),
+                                    ("Martin Luther King's Dayyear (latent)", -5.9575629954323),
+                                    ("Shemini Atzeretyear (latent)", -6.363028103540465),
+                                    ("daymonth", -4.3481250829982), ("monthday", -5.9575629954323),
+                                    ("monthyear", -4.57126863431241),
+                                    ("Yom Ha'atzmautyear (latent)", -6.363028103540465),
+                                    ("Vijayadashamiyear (latent)", -6.363028103540465),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -5.955837369464831),
-                                    ("Thanksgiving Dayyear (latent)", -5.262690188904886),
-                                    ("Thai Pongalyear (latent)", -5.66815529701305),
-                                    ("Thiru Onamyear (latent)", -5.66815529701305),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.361302477572996),
+                                     -5.9575629954323),
+                                    ("Thanksgiving Dayyear (latent)", -5.264415814872355),
+                                    ("Thai Pongalyear (latent)", -5.66988092298052),
+                                    ("Thiru Onamyear (latent)", -5.66988092298052),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.363028103540465),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.4450117456988405),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.361302477572996),
-                                    ("Krishna Janmashtamiyear (latent)", -5.955837369464831),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.361302477572996),
-                                    ("houryear", -5.4450117456988405),
+                                     -5.44673737166631),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.363028103540465),
+                                    ("Krishna Janmashtamiyear (latent)", -5.9575629954323),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.363028103540465),
+                                    ("houryear", -5.44673737166631),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.361302477572996),
-                                    ("Christmas<time-of-day> am|pm", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("Christmas<time-of-day> am|pm", -6.363028103540465),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.361302477572996),
+                                     -6.363028103540465),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.66815529701305),
-                                    ("intersectin|during <named-month>|year", -6.361302477572996),
-                                    ("<time-of-day> am|pmintersect", -5.1085395090776275),
-                                    ("Earth Houryear (latent)", -6.361302477572996),
-                                    ("Family Dayyear (latent)", -5.4450117456988405),
-                                    ("Octoberyear (latent)", -4.857225080796721),
-                                    ("intersect<time-of-day> am|pm", -6.361302477572996),
-                                    ("Mattu Pongalyear (latent)", -6.361302477572996),
-                                    ("Shavuotyear (latent)", -6.361302477572996),
-                                    ("Parsi New Yearyear (latent)", -5.4450117456988405),
+                                     -5.66988092298052),
+                                    ("intersectin|during <named-month>|year", -6.363028103540465),
+                                    ("<time-of-day> am|pmintersect", -5.110265135045097),
+                                    ("Earth Houryear (latent)", -6.363028103540465),
+                                    ("Family Dayyear (latent)", -5.44673737166631),
+                                    ("Octoberyear (latent)", -4.858950706764191),
+                                    ("intersect<time-of-day> am|pm", -6.363028103540465),
+                                    ("Mattu Pongalyear (latent)", -6.363028103540465),
+                                    ("Shavuotyear (latent)", -6.363028103540465),
+                                    ("Parsi New Yearyear (latent)", -5.44673737166631),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.361302477572996),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.361302477572996),
-                                    ("todayin|within|after <duration>", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.363028103540465),
+                                    ("todayin|within|after <duration>", -6.363028103540465),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.955837369464831),
-                                    ("Marchyear (latent)", -6.361302477572996),
-                                    ("Sukkotyear (latent)", -5.955837369464831),
+                                     -5.9575629954323),
+                                    ("Marchyear (latent)", -6.363028103540465),
+                                    ("Sukkotyear (latent)", -5.9575629954323),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.955837369464831),
-                                    ("Clean Mondayyear (latent)", -5.955837369464831),
-                                    ("monthhour", -5.955837369464831),
+                                     -5.9575629954323),
+                                    ("Clean Mondayyear (latent)", -5.9575629954323),
+                                    ("monthhour", -5.9575629954323),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.66815529701305),
-                                    ("todayat <time-of-day>", -6.361302477572996),
-                                    ("Thursday<time> timezone", -4.415392328517682),
-                                    ("time-of-day (latent)tonight", -5.955837369464831),
-                                    ("from|since|after <time>December", -6.361302477572996),
-                                    ("<time-of-day> am|pmon <day>", -4.3463994570307305),
+                                     -5.66988092298052),
+                                    ("todayat <time-of-day>", -6.363028103540465),
+                                    ("Thursday<time> timezone", -4.4171179544851515),
+                                    ("time-of-day (latent)tonight", -5.9575629954323),
+                                    ("from|since|after <time>December", -6.363028103540465),
+                                    ("<time-of-day> am|pmon <day>", -4.3481250829982),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.361302477572996),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.955837369464831),
-                                    ("dayday", -3.918955442203791),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.361302477572996),
-                                    ("mm/ddat <time-of-day>", -6.361302477572996),
-                                    ("tonightat <time-of-day>", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.9575629954323),
+                                    ("dayday", -3.9206810681712607),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.363028103540465),
+                                    ("mm/ddat <time-of-day>", -6.363028103540465),
+                                    ("tonightat <time-of-day>", -6.363028103540465),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.66815529701305),
+                                     -5.66988092298052),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.361302477572996),
-                                    ("today<time-of-day> am|pm", -6.361302477572996),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.955837369464831),
-                                    ("at <time-of-day><time> <part-of-day>", -6.361302477572996),
-                                    ("<day-of-month> (ordinal)intersect", -5.955837369464831),
-                                    ("mm/dd<time-of-day> am|pm", -6.361302477572996),
-                                    ("hourhour", -4.281860935893159),
-                                    ("Navaratriin|during <named-month>|year", -6.361302477572996),
-                                    ("National Patriots' Dayyear (latent)", -5.66815529701305),
-                                    ("Wednesdaythis|last|next <cycle>", -6.361302477572996),
-                                    ("Lentyear (latent)", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("today<time-of-day> am|pm", -6.363028103540465),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.9575629954323),
+                                    ("at <time-of-day><time> <part-of-day>", -6.363028103540465),
+                                    ("<day-of-month> (ordinal)intersect", -5.9575629954323),
+                                    ("mm/dd<time-of-day> am|pm", -6.363028103540465),
+                                    ("hourhour", -4.283586561860629),
+                                    ("Navaratriin|during <named-month>|year", -6.363028103540465),
+                                    ("National Patriots' Dayyear (latent)", -5.66988092298052),
+                                    ("Wednesdaythis|last|next <cycle>", -6.363028103540465),
+                                    ("Lentyear (latent)", -6.363028103540465),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.857225080796721),
-                                    ("Boghiyear (latent)", -6.361302477572996),
-                                    ("dayyear", -1.8559526268671147),
-                                    ("Thursdayfrom|since|after <time>", -5.955837369464831),
+                                     -4.858950706764191),
+                                    ("Boghiyear (latent)", -6.363028103540465),
+                                    ("dayyear", -1.8576782528345845),
+                                    ("Thursdayfrom|since|after <time>", -5.9575629954323),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.361302477572996),
-                                    ("Thursdayat <time-of-day>", -5.66815529701305),
-                                    ("Islamic New Yearyear (latent)", -5.955837369464831),
-                                    ("Laylat al-Qadryear (latent)", -5.4450117456988405),
-                                    ("Discovery Dayyear (latent)", -5.955837369464831),
-                                    ("Shrove Tuesdayyear (latent)", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("Thursdayat <time-of-day>", -5.66988092298052),
+                                    ("Islamic New Yearyear (latent)", -5.9575629954323),
+                                    ("Laylat al-Qadryear (latent)", -5.44673737166631),
+                                    ("Discovery Dayyear (latent)", -5.9575629954323),
+                                    ("Shrove Tuesdayyear (latent)", -6.363028103540465),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.66815529701305),
-                                    ("<time-of-day> am|pmtomorrow", -5.66815529701305),
-                                    ("Yom Kippuryear (latent)", -6.361302477572996),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.955837369464831),
-                                    ("<part-of-day> of <time>year (latent)", -6.361302477572996),
-                                    ("minutehour", -5.262690188904886),
-                                    ("Kaanum Pongalyear (latent)", -5.955837369464831),
-                                    ("Maha Saptamiyear (latent)", -6.361302477572996),
+                                     -5.66988092298052),
+                                    ("<time-of-day> am|pmtomorrow", -5.66988092298052),
+                                    ("Yom Kippuryear (latent)", -6.363028103540465),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.9575629954323),
+                                    ("<part-of-day> of <time>year (latent)", -6.363028103540465),
+                                    ("minutehour", -5.110265135045097),
+                                    ("Kaanum Pongalyear (latent)", -5.9575629954323),
+                                    ("Maha Saptamiyear (latent)", -6.363028103540465),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.955837369464831),
-                                    ("time-of-day (latent)tomorrow", -5.4450117456988405),
-                                    ("part of daysat <time-of-day>", -5.955837369464831),
+                                     -5.9575629954323),
+                                    ("time-of-day (latent)tomorrow", -5.44673737166631),
+                                    ("part of daysat <time-of-day>", -5.9575629954323),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.65655438533457),
-                                    ("for <duration> from <time>December", -6.361302477572996),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.361302477572996),
+                                     -4.65828001130204),
+                                    ("for <duration> from <time>December", -6.363028103540465),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.363028103540465),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.1085395090776275),
-                                    ("time-of-day (latent)this <part-of-day>", -6.361302477572996),
-                                    ("Pentecostyear (latent)", -6.361302477572996),
+                                     -5.110265135045097),
+                                    ("time-of-day (latent)this <part-of-day>", -6.363028103540465),
+                                    ("Pentecostyear (latent)", -6.363028103540465),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.1085395090776275),
-                                    ("<day-of-month> (ordinal)February", -6.361302477572996),
-                                    ("Eid al-Fitryear (latent)", -5.4450117456988405),
+                                     -5.110265135045097),
+                                    ("<day-of-month> (ordinal)February", -6.363028103540465),
+                                    ("Eid al-Fitryear (latent)", -5.44673737166631),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.361302477572996),
-                                    ("Mondayin|during the <part-of-day>", -6.361302477572996),
-                                    ("Chhathin|during <named-month>|year", -6.361302477572996),
-                                    ("Diwaliin|during <named-month>|year", -6.361302477572996),
-                                    ("Vaisakhiin|during <named-month>|year", -6.361302477572996),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.1085395090776275),
-                                    ("Raksha Bandhanyear (latent)", -6.361302477572996),
-                                    ("daysecond", -5.955837369464831),
+                                     -6.363028103540465),
+                                    ("Mondayin|during the <part-of-day>", -6.363028103540465),
+                                    ("Chhathin|during <named-month>|year", -6.363028103540465),
+                                    ("Diwaliin|during <named-month>|year", -6.363028103540465),
+                                    ("Vaisakhiin|during <named-month>|year", -6.363028103540465),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.110265135045097),
+                                    ("Raksha Bandhanyear (latent)", -6.363028103540465),
+                                    ("daysecond", -5.9575629954323),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.955837369464831),
-                                    ("Ashurayear (latent)", -6.361302477572996),
-                                    ("Tuesdayin|during <named-month>|year", -6.361302477572996),
-                                    ("Chinese New Yearyear (latent)", -6.361302477572996),
-                                    ("tomorrowintersect", -6.361302477572996),
-                                    ("Lag BaOmeryear (latent)", -6.361302477572996),
+                                     -5.9575629954323),
+                                    ("Ashurayear (latent)", -6.363028103540465),
+                                    ("Tuesdayin|during <named-month>|year", -6.363028103540465),
+                                    ("Chinese New Yearyear (latent)", -6.363028103540465),
+                                    ("tomorrowintersect", -6.363028103540465),
+                                    ("Lag BaOmeryear (latent)", -6.363028103540465),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.361302477572996),
-                                    ("Eid al-Adhayear (latent)", -4.221236314076725),
-                                    ("intersectin|during the <part-of-day>", -6.361302477572996),
-                                    ("Palm Sundayyear (latent)", -6.361302477572996),
-                                    ("Christmasat <time-of-day>", -6.361302477572996),
-                                    ("Passoveryear (latent)", -6.361302477572996),
-                                    ("Lazarus Saturdayyear (latent)", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("Eid al-Adhayear (latent)", -4.222961940044194),
+                                    ("intersectin|during the <part-of-day>", -6.363028103540465),
+                                    ("Palm Sundayyear (latent)", -6.363028103540465),
+                                    ("Christmasat <time-of-day>", -6.363028103540465),
+                                    ("Passoveryear (latent)", -6.363028103540465),
+                                    ("Lazarus Saturdayyear (latent)", -6.363028103540465),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.361302477572996),
-                                    ("Yom HaShoahyear (latent)", -5.955837369464831),
+                                     -6.363028103540465),
+                                    ("Yom HaShoahyear (latent)", -5.9575629954323),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.955837369464831),
+                                     -5.9575629954323),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.361302477572996),
-                                    ("Septemberyear (latent)", -5.955837369464831),
+                                     -6.363028103540465),
+                                    ("Septemberyear (latent)", -5.9575629954323),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.857225080796721),
-                                    ("Halloweenyear (latent)", -6.361302477572996),
+                                     -4.858950706764191),
+                                    ("Halloweenyear (latent)", -6.363028103540465),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.955837369464831),
+                                     -5.9575629954323),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.66815529701305),
+                                     -5.66988092298052),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.361302477572996),
-                                    ("at <time-of-day>intersect", -5.955837369464831),
-                                    ("Rosh Hashanahyear (latent)", -5.66815529701305),
-                                    ("Dhanterasyear (latent)", -6.361302477572996),
-                                    ("Tu BiShvatyear (latent)", -6.361302477572996),
-                                    ("<day-of-month> (ordinal)December", -5.66815529701305),
-                                    ("Holiyear (latent)", -5.66815529701305),
+                                     -6.363028103540465),
+                                    ("at <time-of-day>intersect", -5.9575629954323),
+                                    ("Rosh Hashanahyear (latent)", -5.66988092298052),
+                                    ("Dhanterasyear (latent)", -6.363028103540465),
+                                    ("Tu BiShvatyear (latent)", -6.363028103540465),
+                                    ("<day-of-month> (ordinal)December", -5.66988092298052),
+                                    ("Holiyear (latent)", -5.66988092298052),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.361302477572996),
-                                    ("Holika Dahanyear (latent)", -5.66815529701305),
+                                     -6.363028103540465),
+                                    ("Holika Dahanyear (latent)", -5.66988092298052),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.361302477572996),
-                                    ("dayminute", -3.443531745488716),
-                                    ("Mawlidyear (latent)", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("dayminute", -3.445257371456186),
+                                    ("Mawlidyear (latent)", -6.363028103540465),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.955837369464831),
+                                     -5.9575629954323),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.361302477572996),
-                                    ("Jumu'atul-Widayear (latent)", -5.4450117456988405),
-                                    ("minuteday", -2.5326610810839),
+                                     -6.363028103540465),
+                                    ("Jumu'atul-Widayear (latent)", -5.44673737166631),
+                                    ("minuteday", -2.53438670705137),
                                     ("absorption of , after named dayintersect",
-                                     -6.361302477572996),
-                                    ("intersectyear (latent)", -6.361302477572996),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("intersectyear (latent)", -6.363028103540465),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.363028103540465),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.361302477572996),
+                                     -6.363028103540465),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.361302477572996),
+                                     -6.363028103540465),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.361302477572996),
-                                    ("Boss's Dayyear (latent)", -5.955837369464831),
-                                    ("Global Youth Service Dayyear (latent)", -6.361302477572996),
-                                    ("Dhanterasin|during <named-month>|year", -6.361302477572996),
-                                    ("Tisha B'Avyear (latent)", -6.361302477572996),
-                                    ("Isra and Mi'rajyear (latent)", -5.4450117456988405),
-                                    ("at <time-of-day>on <day>", -5.262690188904886),
+                                     -6.363028103540465),
+                                    ("Boss's Dayyear (latent)", -5.9575629954323),
+                                    ("Global Youth Service Dayyear (latent)", -6.363028103540465),
+                                    ("Dhanterasin|during <named-month>|year", -6.363028103540465),
+                                    ("Tisha B'Avyear (latent)", -6.363028103540465),
+                                    ("Isra and Mi'rajyear (latent)", -5.44673737166631),
+                                    ("at <time-of-day>on <day>", -5.264415814872355),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.361302477572996),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.66815529701305),
-                                    ("Christmasyear (latent)", -5.955837369464831),
-                                    ("Naraka Chaturdashiyear (latent)", -5.955837369464831),
-                                    ("Thai Pongalin|during <named-month>|year", -6.361302477572996),
-                                    ("dayweek", -6.361302477572996),
-                                    ("Easter Sundayyear (latent)", -5.66815529701305),
+                                     -6.363028103540465),
+                                    ("time-of-day (latent)<time> <part-of-day>", -5.66988092298052),
+                                    ("Christmasyear (latent)", -5.9575629954323),
+                                    ("Naraka Chaturdashiyear (latent)", -5.9575629954323),
+                                    ("Thai Pongalin|during <named-month>|year", -6.363028103540465),
+                                    ("dayweek", -6.363028103540465),
+                                    ("Easter Sundayyear (latent)", -5.66988092298052),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.751864565138895),
-                                    ("Labour Dayyear (latent)", -6.361302477572996),
-                                    ("weekyear", -5.262690188904886),
-                                    ("King's Dayyear (latent)", -4.857225080796721),
-                                    ("hh:mmin|during the <part-of-day>", -5.66815529701305),
+                                     -4.7535901911063645),
+                                    ("Labour Dayyear (latent)", -6.363028103540465),
+                                    ("weekyear", -5.264415814872355),
+                                    ("King's Dayyear (latent)", -4.858950706764191),
+                                    ("hh:mmin|during the <part-of-day>", -5.44673737166631),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.955837369464831),
-                                    ("Hanukkahyear (latent)", -5.66815529701305),
-                                    ("February<time> <part-of-day>", -6.361302477572996),
+                                     -5.9575629954323),
+                                    ("Hanukkahyear (latent)", -5.66988092298052),
+                                    ("February<time> <part-of-day>", -6.363028103540465),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.361302477572996),
-                                    ("Great Lentyear (latent)", -6.361302477572996),
-                                    ("tomorrowat <time-of-day>", -5.66815529701305),
+                                     -6.363028103540465),
+                                    ("Great Lentyear (latent)", -6.363028103540465),
+                                    ("tomorrowat <time-of-day>", -5.66988092298052),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.361302477572996),
-                                    ("Vaisakhiyear (latent)", -5.66815529701305),
+                                     -6.363028103540465),
+                                    ("Vaisakhiyear (latent)", -5.66988092298052),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.361302477572996),
-                                    ("last <cycle> of <time>year (latent)", -5.66815529701305),
-                                    ("at <time-of-day>tomorrow", -5.955837369464831),
-                                    ("tomorrow<time-of-day> am|pm", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("last <cycle> of <time>year (latent)", -5.66988092298052),
+                                    ("at <time-of-day>tomorrow", -5.9575629954323),
+                                    ("tomorrow<time-of-day> am|pm", -6.363028103540465),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.361302477572996),
-                                    ("Diwaliyear (latent)", -6.361302477572996),
-                                    ("between <time> and <time>on <day>", -4.751864565138895),
-                                    ("Black Fridayyear (latent)", -5.955837369464831),
+                                     -6.363028103540465),
+                                    ("Diwaliyear (latent)", -6.363028103540465),
+                                    ("between <time> and <time>on <day>", -4.7535901911063645),
+                                    ("Black Fridayyear (latent)", -5.9575629954323),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.361302477572996),
+                                     -6.363028103540465),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.361302477572996),
-                                    ("Chhathyear (latent)", -5.955837369464831),
-                                    ("Vasant Panchamiyear (latent)", -6.361302477572996),
-                                    ("Rabindra Jayantiyear (latent)", -5.1085395090776275),
-                                    ("St Patrick's Dayyear (latent)", -6.361302477572996),
-                                    ("Thursday<time> (timezone)", -6.361302477572996),
+                                     -6.363028103540465),
+                                    ("Chhathyear (latent)", -5.9575629954323),
+                                    ("Vasant Panchamiyear (latent)", -6.363028103540465),
+                                    ("Rabindra Jayantiyear (latent)", -5.110265135045097),
+                                    ("St Patrick's Dayyear (latent)", -6.363028103540465),
+                                    ("Thursday<time> (timezone)", -6.363028103540465),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.361302477572996),
-                                    ("<datetime> - <datetime> (interval)July", -5.955837369464831),
+                                     -6.363028103540465),
+                                    ("<datetime> - <datetime> (interval)July", -5.9575629954323),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.955837369464831),
-                                    ("Februaryintersect", -6.361302477572996),
-                                    ("Mother's Dayyear (latent)", -6.361302477572996),
-                                    ("Simchat Torahyear (latent)", -6.361302477572996),
-                                    ("Victoria Dayyear (latent)", -5.955837369464831),
-                                    ("minuteyear", -6.361302477572996)],
-                               n = 442},
+                                     -5.9575629954323),
+                                    ("Februaryintersect", -6.363028103540465),
+                                    ("Mother's Dayyear (latent)", -6.363028103540465),
+                                    ("Simchat Torahyear (latent)", -6.363028103540465),
+                                    ("Victoria Dayyear (latent)", -5.9575629954323),
+                                    ("minuteyear", -6.363028103540465)],
+                               n = 443},
                    koData =
-                     ClassData{prior = -0.958304742933049, unseen = -6.715383386334681,
+                     ClassData{prior = -0.9574604920038966, unseen = -6.717804695023691,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1306515914533617),
+                                   [("hourday", -3.133075835064868),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.021023349349527),
-                                    ("<day-of-month> (ordinal)August", -6.021023349349527),
-                                    ("dayhour", -3.346874699922998),
-                                    ("<time> timezoneyear (latent)", -6.021023349349527),
+                                     -6.023447592961032),
+                                    ("<day-of-month> (ordinal)August", -6.023447592961032),
+                                    ("dayhour", -3.349298943534504),
+                                    ("<time> timezoneyear (latent)", -6.023447592961032),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.1047326174753715),
-                                    ("Tuesdayfrom|since|after <time>", -5.327876168789581),
-                                    ("daymonth", -3.536116699561526),
-                                    ("monthyear", -4.768260380854159),
-                                    ("<time-of-day> am|pmyear (latent)", -5.327876168789581),
-                                    ("Thai Pongalyear (latent)", -5.327876168789581),
-                                    ("intersecthh:mm", -6.021023349349527),
+                                     -5.107156861086878),
+                                    ("Tuesdayfrom|since|after <time>", -5.330300412401088),
+                                    ("daymonth", -3.5385409431730324),
+                                    ("monthyear", -4.770684624465665),
+                                    ("<time-of-day> am|pmyear (latent)", -5.330300412401088),
+                                    ("Thai Pongalyear (latent)", -5.330300412401088),
+                                    ("intersecthh:mm", -6.023447592961032),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.615558241241362),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.021023349349527),
-                                    ("houryear", -4.634728988229636),
+                                     -5.6179824848528686),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.023447592961032),
+                                    ("houryear", -4.637153231841142),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.021023349349527),
-                                    ("<day-of-month> (ordinal)October", -6.021023349349527),
+                                     -6.023447592961032),
+                                    ("<day-of-month> (ordinal)October", -6.023447592961032),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.327876168789581),
-                                    ("hournograin", -4.768260380854159),
-                                    ("<time-of-day> am|pmintersect", -4.768260380854159),
-                                    ("Octoberyear (latent)", -6.021023349349527),
+                                     -5.330300412401088),
+                                    ("hournograin", -4.770684624465665),
+                                    ("<time-of-day> am|pmintersect", -4.770684624465665),
+                                    ("Octoberyear (latent)", -6.023447592961032),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.615558241241362),
-                                    ("until <time>on <day>", -5.327876168789581),
-                                    ("time-of-day (latent)intersect", -5.327876168789581),
-                                    ("todayin <number> (implicit minutes)", -6.021023349349527),
+                                     -5.6179824848528686),
+                                    ("until <time>on <day>", -5.330300412401088),
+                                    ("time-of-day (latent)intersect", -5.330300412401088),
+                                    ("todayin <number> (implicit minutes)", -6.023447592961032),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.327876168789581),
+                                     -5.330300412401088),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.021023349349527),
-                                    ("hh:mmon <day>", -3.578676313980322),
-                                    ("absorption of , after named dayJuly", -5.615558241241362),
-                                    ("from|since|after <time>July", -5.615558241241362),
+                                     -6.023447592961032),
+                                    ("hh:mmon <day>", -3.5811005575918284),
+                                    ("absorption of , after named dayJuly", -5.6179824848528686),
+                                    ("from|since|after <time>July", -5.6179824848528686),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.1047326174753715),
-                                    ("Clean Mondayyear (latent)", -6.021023349349527),
-                                    ("monthhour", -6.021023349349527),
+                                     -5.107156861086878),
+                                    ("Clean Mondayyear (latent)", -6.023447592961032),
+                                    ("monthhour", -6.023447592961032),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.615558241241362),
-                                    ("hourmonth", -4.149221172447935),
-                                    ("todayat <time-of-day>", -6.021023349349527),
-                                    ("from|since|after <time>December", -6.021023349349527),
+                                     -5.6179824848528686),
+                                    ("hourmonth", -4.151645416059441),
+                                    ("todayat <time-of-day>", -6.023447592961032),
+                                    ("from|since|after <time>December", -6.023447592961032),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.021023349349527),
-                                    ("<time-of-day> am|pmon <day>", -4.768260380854159),
-                                    ("Mondayyear (latent)", -5.327876168789581),
-                                    ("dayday", -4.634728988229636),
-                                    ("mm/ddat <time-of-day>", -5.615558241241362),
-                                    ("on <day>September", -5.615558241241362),
-                                    ("time-of-day (latent)September", -5.615558241241362),
-                                    ("hourhour", -6.021023349349527),
-                                    ("time-of-day (latent)on <day>", -3.578676313980322),
+                                     -6.023447592961032),
+                                    ("<time-of-day> am|pmon <day>", -4.770684624465665),
+                                    ("Mondayyear (latent)", -5.330300412401088),
+                                    ("dayday", -4.637153231841142),
+                                    ("mm/ddat <time-of-day>", -5.6179824848528686),
+                                    ("on <day>September", -5.6179824848528686),
+                                    ("time-of-day (latent)September", -5.6179824848528686),
+                                    ("hourhour", -5.6179824848528686),
+                                    ("time-of-day (latent)on <day>", -3.5811005575918284),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.615558241241362),
-                                    ("dayyear", -3.076584370183086),
-                                    ("Thursdaymm/dd", -6.021023349349527),
-                                    ("New Year's Dayyear (latent)", -5.1047326174753715),
-                                    ("time-of-day (latent)Sunday", -5.615558241241362),
-                                    ("Thursdayfrom|since|after <time>", -4.316275257111101),
-                                    ("Thursdayat <time-of-day>", -4.411585436915426),
+                                     -5.6179824848528686),
+                                    ("dayyear", -3.0790086137945925),
+                                    ("Thursdaymm/dd", -6.023447592961032),
+                                    ("New Year's Dayyear (latent)", -5.107156861086878),
+                                    ("time-of-day (latent)Sunday", -5.6179824848528686),
+                                    ("Thursdayfrom|since|after <time>", -4.318699500722608),
+                                    ("Thursdayat <time-of-day>", -4.414009680526933),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.021023349349527),
-                                    ("Aprilyear (latent)", -6.021023349349527),
-                                    ("the <day-of-month> (ordinal)July", -6.021023349349527),
-                                    ("the <day-of-month> (number)July", -6.021023349349527),
-                                    ("monthminute", -6.021023349349527),
-                                    ("<time-of-day> am|pmtomorrow", -6.021023349349527),
-                                    ("Thursdayhh:mm", -5.1047326174753715),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.615558241241362),
-                                    ("minutemonth", -4.149221172447935),
-                                    ("time-of-day (latent)Friday", -5.615558241241362),
-                                    ("minutehour", -6.021023349349527),
-                                    ("Augustyear (latent)", -5.615558241241362),
-                                    ("week-endin|during <named-month>|year", -6.021023349349527),
-                                    ("time-of-day (latent)Tuesday", -5.615558241241362),
+                                     -6.023447592961032),
+                                    ("Aprilyear (latent)", -6.023447592961032),
+                                    ("the <day-of-month> (ordinal)July", -6.023447592961032),
+                                    ("the <day-of-month> (number)July", -6.023447592961032),
+                                    ("monthminute", -6.023447592961032),
+                                    ("<time-of-day> am|pmtomorrow", -6.023447592961032),
+                                    ("Thursdayhh:mm", -5.107156861086878),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.6179824848528686),
+                                    ("minutemonth", -4.151645416059441),
+                                    ("time-of-day (latent)Friday", -5.6179824848528686),
+                                    ("minutehour", -6.023447592961032),
+                                    ("Augustyear (latent)", -5.6179824848528686),
+                                    ("week-endin|during <named-month>|year", -6.023447592961032),
+                                    ("time-of-day (latent)Tuesday", -5.6179824848528686),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.615558241241362),
+                                     -5.6179824848528686),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.021023349349527),
-                                    ("Sundayyear (latent)", -5.1047326174753715),
-                                    ("Christmasat <time-of-day>", -6.021023349349527),
-                                    ("from|since|after <time>year (latent)", -4.922411060681417),
-                                    ("<duration> after|before|from <time>December",
-                                     -6.021023349349527),
-                                    ("yesterday<time-of-day> am|pm", -6.021023349349527),
-                                    ("<day-of-month> (ordinal)July", -5.327876168789581),
+                                     -6.023447592961032),
+                                    ("Sundayyear (latent)", -5.107156861086878),
+                                    ("Christmasat <time-of-day>", -6.023447592961032),
+                                    ("from|since|after <time>year (latent)", -4.924835304292923),
+                                    ("yesterday<time-of-day> am|pm", -6.023447592961032),
+                                    ("<day-of-month> (ordinal)July", -5.330300412401088),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.021023349349527),
-                                    ("mm/ddyear (latent)", -6.021023349349527),
+                                     -6.023447592961032),
+                                    ("mm/ddyear (latent)", -6.023447592961032),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.021023349349527),
+                                     -6.023447592961032),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.021023349349527),
-                                    ("at <time-of-day>intersect", -5.615558241241362),
-                                    ("hh:mmyear (latent)", -3.9415818076696905),
-                                    ("Holiyear (latent)", -6.021023349349527),
-                                    ("until <time><time-of-day> am|pm", -6.021023349349527),
+                                     -6.023447592961032),
+                                    ("at <time-of-day>intersect", -5.6179824848528686),
+                                    ("hh:mmyear (latent)", -3.944006051281197),
+                                    ("Holiyear (latent)", -6.023447592961032),
+                                    ("until <time><time-of-day> am|pm", -6.023447592961032),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.021023349349527),
-                                    ("dayminute", -3.4183336639051425),
-                                    ("yyyy-mm-ddhh:mm", -5.615558241241362),
-                                    ("intersectfrom|since|after <time>", -5.615558241241362),
-                                    ("intersectSeptember", -4.516945952573252),
-                                    ("minuteday", -2.782344897185146),
+                                     -6.023447592961032),
+                                    ("dayminute", -3.420757907516649),
+                                    ("yyyy-mm-ddhh:mm", -5.6179824848528686),
+                                    ("intersectfrom|since|after <time>", -5.6179824848528686),
+                                    ("intersectSeptember", -4.5193701961847585),
+                                    ("minuteday", -2.7847691407966524),
                                     ("absorption of , after named dayintersect",
-                                     -6.021023349349527),
-                                    ("intersectyear (latent)", -6.021023349349527),
-                                    ("Februaryin|during the <part-of-day>", -6.021023349349527),
-                                    ("time-of-day (latent)July", -5.327876168789581),
-                                    ("Saturdayyear (latent)", -6.021023349349527),
-                                    ("at <time-of-day>on <day>", -5.615558241241362),
+                                     -6.023447592961032),
+                                    ("intersectyear (latent)", -6.023447592961032),
+                                    ("Februaryin|during the <part-of-day>", -6.023447592961032),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -6.023447592961032),
+                                    ("time-of-day (latent)July", -5.330300412401088),
+                                    ("Saturdayyear (latent)", -6.023447592961032),
+                                    ("at <time-of-day>on <day>", -5.6179824848528686),
                                     ("absorption of , after named daySeptember",
-                                     -5.1047326174753715),
-                                    ("Naraka Chaturdashiyear (latent)", -6.021023349349527),
-                                    ("from|since|after <time>on <day>", -5.1047326174753715),
-                                    ("dayweek", -6.021023349349527),
-                                    ("Easter Sundayyear (latent)", -5.615558241241362),
-                                    ("Thursday<time-of-day> am|pm", -4.768260380854159),
-                                    ("weekyear", -5.615558241241362),
-                                    ("time-of-day (latent)Thursday", -5.615558241241362),
+                                     -5.107156861086878),
+                                    ("Naraka Chaturdashiyear (latent)", -6.023447592961032),
+                                    ("from|since|after <time>on <day>", -5.107156861086878),
+                                    ("dayweek", -6.023447592961032),
+                                    ("Easter Sundayyear (latent)", -5.6179824848528686),
+                                    ("Thursday<time-of-day> am|pm", -4.770684624465665),
+                                    ("weekyear", -5.6179824848528686),
+                                    ("time-of-day (latent)Thursday", -5.6179824848528686),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.021023349349527),
-                                    ("<day-of-month> (ordinal)April", -6.021023349349527),
+                                     -6.023447592961032),
+                                    ("<day-of-month> (ordinal)April", -6.023447592961032),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.615558241241362),
+                                     -5.6179824848528686),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.327876168789581),
-                                    ("Sundayfrom|since|after <time>", -6.021023349349527),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.1047326174753715),
+                                     -5.330300412401088),
+                                    ("Sundayfrom|since|after <time>", -6.023447592961032),
+                                    ("absorption of , after named dayFebruary", -5.107156861086878),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.021023349349527),
+                                     -5.6179824848528686),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.021023349349527),
-                                    ("tomorrowat <time-of-day>", -6.021023349349527),
-                                    ("daynograin", -5.615558241241362),
+                                     -6.023447592961032),
+                                    ("tomorrowat <time-of-day>", -6.023447592961032),
+                                    ("daynograin", -5.6179824848528686),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.615558241241362),
-                                    ("last <cycle> of <time>year (latent)", -5.615558241241362),
-                                    ("tomorrow<time-of-day> am|pm", -6.021023349349527),
+                                     -5.6179824848528686),
+                                    ("last <cycle> of <time>year (latent)", -5.6179824848528686),
+                                    ("tomorrow<time-of-day> am|pm", -6.023447592961032),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.327876168789581),
-                                    ("Diwaliyear (latent)", -5.615558241241362),
+                                     -5.330300412401088),
+                                    ("Diwaliyear (latent)", -5.6179824848528686),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.021023349349527),
-                                    ("Fridayyear (latent)", -5.615558241241362),
-                                    ("time-of-day (latent)April", -6.021023349349527),
-                                    ("minuteyear", -3.823798772013307)],
-                               n = 275}}),
+                                     -6.023447592961032),
+                                    ("Fridayyear (latent)", -5.6179824848528686),
+                                    ("time-of-day (latent)April", -6.023447592961032),
+                                    ("minuteyear", -3.8262230156248136)],
+                               n = 276}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1654,19 +1652,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1948,16 +1946,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2193,8 +2191,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2224,19 +2222,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8441874379728111, unseen = -4.553876891600541,
+                     ClassData{prior = -0.8064758658669484, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.561954970288595, unseen = -4.8283137373023015,
+                     ClassData{prior = -0.5913644862500029, unseen = -4.844187086458591,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.669137449867228e-2),
-                                    ("integer (0..19)", -2.740840023925201)],
-                               n = 122}}),
+                                   [("integer (numeric)", -6.559728248581323e-2),
+                                    ("integer (0..19)", -2.7568403652716422)],
+                               n = 124}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2259,33 +2257,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11506932978478723,
-                               unseen = -5.231108616854587,
+                     ClassData{prior = -0.10880285984879906,
+                               unseen = -5.2832037287379885,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5866893440979424),
-                                    ("integer (0..19)year (grain)", -3.028522096376982),
-                                    ("integer (numeric)day (grain)", -2.5866893440979424),
-                                    ("integer (0..19)second (grain) ", -3.8394523125933104),
-                                    ("integer (0..19)hour (grain)", -3.028522096376982),
-                                    ("second", -3.4339872044851463),
-                                    ("integer (numeric)second (grain) ", -4.127134385045092),
-                                    ("integer (numeric)year (grain)", -3.2798365246578878),
-                                    ("day", -2.3353749158170367), ("year", -2.517696472610991),
-                                    ("integer (numeric)week (grain)", -3.146305132033365),
-                                    ("integer (0..19)month (grain)", -3.6163087612791007),
-                                    ("integer (20..90)minute (grain)", -4.532599493153256),
-                                    ("hour", -2.6607973162516645), ("month", -3.2798365246578878),
-                                    ("integer (numeric)minute (grain)", -3.146305132033365),
-                                    ("integer (0..19)minute (grain)", -3.146305132033365),
-                                    ("integer (numeric)month (grain)", -4.127134385045092),
-                                    ("minute", -2.45315795147342),
-                                    ("integer (numeric)hour (grain)", -3.6163087612791007),
-                                    ("integer (0..19)day (grain)", -3.6163087612791007),
-                                    ("integer (0..19)week (grain)", -3.2798365246578878)],
-                               n = 82},
+                                   [("week", -2.639057329615259),
+                                    ("integer (0..19)year (grain)", -3.0808900818942977),
+                                    ("integer (numeric)day (grain)", -2.639057329615259),
+                                    ("integer (0..19)second (grain) ", -3.891820298110627),
+                                    ("integer (0..19)hour (grain)", -3.0808900818942977),
+                                    ("second", -3.4863551900024623),
+                                    ("integer (numeric)second (grain) ", -4.179502370562408),
+                                    ("integer (numeric)year (grain)", -3.332204510175204),
+                                    ("day", -2.3877429013343523), ("year", -2.570064458128307),
+                                    ("integer (numeric)week (grain)", -3.1986731175506815),
+                                    ("integer (0..19)month (grain)", -3.6686767467964168),
+                                    ("integer (20..90)minute (grain)", -4.584967478670572),
+                                    ("hour", -2.7131653017689805), ("month", -3.332204510175204),
+                                    ("integer (numeric)minute (grain)", -2.7131653017689805),
+                                    ("integer (0..19)minute (grain)", -3.1986731175506815),
+                                    ("integer (numeric)month (grain)", -4.179502370562408),
+                                    ("minute", -2.2335922215070942),
+                                    ("integer (numeric)hour (grain)", -3.6686767467964168),
+                                    ("integer (0..19)day (grain)", -3.6686767467964168),
+                                    ("integer (0..19)week (grain)", -3.332204510175204)],
+                               n = 87},
                    koData =
-                     ClassData{prior = -2.2192034840549946,
+                     ClassData{prior = -2.2721258855093374,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2327,39 +2325,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.564520407322694,
+                     ClassData{prior = -0.24709679233670262,
+                               unseen = -5.645446897643238,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.6147714819602146),
-                                    ("integer after|past <hour-of-day>", -4.174387269895637),
-                                    ("at <time-of-day>", -2.3025850929940455),
-                                    ("<time-of-day> o'clock", -4.462069342347418),
-                                    ("half after|past <hour-of-day>", -4.462069342347418),
-                                    ("second", -4.867534450455582),
-                                    ("hh:mm:ss", -4.867534450455582),
-                                    ("<hour-of-day> <integer>", -3.951243718581427),
-                                    ("time-of-day (latent)", -1.6688613329049011),
-                                    ("hhmm (latent)", -4.867534450455582),
-                                    ("hh:mm", -2.382627800667582),
-                                    ("quarter after|past <hour-of-day>", -4.867534450455582),
-                                    ("until <time>", -4.174387269895637),
-                                    ("about|exactly <time-of-day>", -4.867534450455582),
-                                    ("hour", -1.2039728043259361),
-                                    ("<time-of-day> sharp|exactly", -4.867534450455582),
-                                    ("minute", -1.7764919970972666)],
-                               n = 121},
+                                   [("from|since|after <time>", -3.6959969218828004),
+                                    ("integer after|past <hour-of-day>", -4.255612709818223),
+                                    ("at <time-of-day>", -2.3838105329166317),
+                                    ("<time-of-day> o'clock", -4.543294782270004),
+                                    ("half after|past <hour-of-day>", -4.543294782270004),
+                                    ("second", -4.948759890378168),
+                                    ("hh:mm:ss", -4.948759890378168),
+                                    ("<hour-of-day> <integer>", -4.032469158504013),
+                                    ("time-of-day (latent)", -1.6716151573859919),
+                                    ("hhmm (latent)", -4.948759890378168),
+                                    ("hh:mm", -2.3097025607629096),
+                                    ("quarter after|past <hour-of-day>", -4.032469158504013),
+                                    ("until <time>", -4.255612709818223),
+                                    ("about|exactly <time-of-day>", -4.948759890378168),
+                                    ("hour", -1.2351878236738605),
+                                    ("<time-of-day> sharp|exactly", -4.948759890378168),
+                                    ("minute", -1.7100814382137877)],
+                               n = 132},
                    koData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.442651256490317,
+                     ClassData{prior = -1.518980802278849, unseen = -4.532599493153256,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.044522437723423),
-                                    ("from|since|after <time>", -3.332204510175204),
-                                    ("at <time-of-day>", -3.332204510175204),
-                                    ("time-of-day (latent)", -1.252762968495368),
-                                    ("hh:mm", -3.332204510175204),
-                                    ("until <time>", -3.7376696182833684),
-                                    ("hour", -1.0986122886681098), ("minute", -2.4849066497880004)],
-                               n = 33}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1354942159291497),
+                                    ("from|since|after <time>", -3.1354942159291497),
+                                    ("at <time-of-day>", -3.4231762883809305),
+                                    ("time-of-day (latent)", -1.2259517110447111),
+                                    ("hh:mm", -3.4231762883809305),
+                                    ("until <time>", -3.828641396489095),
+                                    ("hour", -1.0560526742493137), ("minute", -2.575878427993727)],
+                               n = 37}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2440,7 +2439,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2456,13 +2455,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2497,11 +2497,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.10109611687136875,
-                               unseen = -4.564348191467836,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 94},
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -4.624972813284271,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 100},
                    koData =
-                     ClassData{prior = -2.341805806147327, unseen = -2.4849066497880004,
+                     ClassData{prior = -2.3978952727983707,
+                               unseen = -2.4849066497880004,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
@@ -2574,16 +2575,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2929,41 +2978,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3439,12 +3453,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3679,11 +3693,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_GB.hs b/Duckling/Ranking/Classifiers/EN_GB.hs
index a5b2b289..8d48518d 100644
--- a/Duckling/Ranking/Classifiers/EN_GB.hs
+++ b/Duckling/Ranking/Classifiers/EN_GB.hs
@@ -80,11 +80,12 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.6307893195165704, unseen = -5.988961416889864,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 397},
+                     ClassData{prior = -0.6292556992378956, unseen = -6.025865973825314,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 412},
                    koData =
-                     ClassData{prior = -0.7596536780013338, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.7614010902545411,
+                               unseen = -5.8944028342648505,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 361}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +117,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -254,7 +255,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -275,54 +276,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -381,55 +386,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -1.6582280766035324,
@@ -447,32 +450,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.14035735769492247,
-                               unseen = -5.075173815233827,
+                     ClassData{prior = -0.1466034741918754, unseen = -5.111987788356543,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.6826098411003407),
-                                    ("noon|midnight|EOD|end of day", -3.970291913552122),
-                                    ("integer after|past <hour-of-day>", -3.970291913552122),
-                                    ("half after|past <hour-of-day>", -4.375757021660286),
-                                    ("<hour-of-day> <integer>", -3.970291913552122),
-                                    ("time-of-day (latent)", -1.7366996920450277),
-                                    ("hhmm (latent)", -3.6826098411003407),
-                                    ("<time-of-day> am|pm", -1.8108076641987496),
-                                    ("hh:mm", -3.2771447329921766),
-                                    ("about|exactly <time-of-day>", -3.970291913552122),
-                                    ("hour", -1.1176604836388042),
-                                    ("<time-of-day> sharp|exactly", -4.375757021660286),
-                                    ("minute", -1.9334099862910819)],
-                               n = 73},
+                                   [("<time> timezone", -3.71965111278069),
+                                    ("noon|midnight|EOD|end of day", -4.007333185232471),
+                                    ("integer after|past <hour-of-day>", -3.71965111278069),
+                                    ("half after|past <hour-of-day>", -4.412798293340635),
+                                    ("<hour-of-day> <integer>", -3.71965111278069),
+                                    ("time-of-day (latent)", -1.7386496439141066),
+                                    ("hhmm (latent)", -3.71965111278069),
+                                    ("<time-of-day> am|pm", -1.8478489358790986),
+                                    ("hh:mm", -3.3141860046725258),
+                                    ("about|exactly <time-of-day>", -4.007333185232471),
+                                    ("hour", -1.1356535603484588),
+                                    ("<time-of-day> sharp|exactly", -4.412798293340635),
+                                    ("minute", -1.8870696490323797)],
+                               n = 76},
                    koData =
-                     ClassData{prior = -2.032921526044943, unseen = -3.58351893845611,
+                     ClassData{prior = -1.9924301646902063,
+                               unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.252762968495368),
-                                    ("<time-of-day> am|pm", -2.456735772821304),
-                                    ("hour", -1.0704414117014134)],
-                               n = 11}}),
+                                   [("time-of-day (latent)", -1.213022639845854),
+                                    ("<time-of-day> am|pm", -2.512305623976115),
+                                    ("hour", -1.0459685551826876)],
+                               n = 12}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -838,422 +841,422 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.5052545787165352, unseen = -7.037905963447182,
+                     ClassData{prior = -0.5057318410457343, unseen = -7.039660349862076,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.343880434126331),
-                                    ("Father's Dayyear (latent)", -6.343880434126331),
+                                   [("Navaratriyear (latent)", -6.345636360828596),
+                                    ("Father's Dayyear (latent)", -6.345636360828596),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.343880434126331),
-                                    ("Ramadanyear (latent)", -5.427589702252176),
+                                     -6.345636360828596),
+                                    ("Ramadanyear (latent)", -5.429345628954441),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.328977413584066),
-                                    ("Bhai Doojyear (latent)", -6.343880434126331),
-                                    ("hourday", -4.328977413584066),
-                                    ("dayhour", -3.3994414549598906),
+                                     -4.330733340286331),
+                                    ("Bhai Doojyear (latent)", -6.345636360828596),
+                                    ("hourday", -4.330733340286331),
+                                    ("dayhour", -3.4011973816621555),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.328977413584066),
-                                    ("Martin Luther King's Dayyear (latent)", -5.938415326018166),
-                                    ("Shemini Atzeretyear (latent)", -6.343880434126331),
-                                    ("daymonth", -4.328977413584066),
-                                    ("monthday", -5.938415326018166),
-                                    ("monthyear", -4.552120964898276),
-                                    ("Yom Ha'atzmautyear (latent)", -6.343880434126331),
-                                    ("Vijayadashamiyear (latent)", -6.343880434126331),
-                                    ("Thanksgiving Dayyear (latent)", -5.245268145458221),
-                                    ("Thai Pongalyear (latent)", -5.6507332535663855),
-                                    ("Thiru Onamyear (latent)", -5.6507332535663855),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.343880434126331),
+                                     -4.330733340286331),
+                                    ("Martin Luther King's Dayyear (latent)", -5.940171252720432),
+                                    ("Shemini Atzeretyear (latent)", -6.345636360828596),
+                                    ("daymonth", -4.330733340286331),
+                                    ("monthday", -5.940171252720432),
+                                    ("monthyear", -4.553876891600541),
+                                    ("Yom Ha'atzmautyear (latent)", -6.345636360828596),
+                                    ("Vijayadashamiyear (latent)", -6.345636360828596),
+                                    ("Thanksgiving Dayyear (latent)", -5.247024072160486),
+                                    ("Thai Pongalyear (latent)", -5.652489180268651),
+                                    ("Thiru Onamyear (latent)", -5.652489180268651),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.345636360828596),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.427589702252176),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.343880434126331),
-                                    ("Krishna Janmashtamiyear (latent)", -5.938415326018166),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.343880434126331),
-                                    ("houryear", -5.427589702252176),
+                                     -5.429345628954441),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.345636360828596),
+                                    ("Krishna Janmashtamiyear (latent)", -5.940171252720432),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.345636360828596),
+                                    ("houryear", -5.429345628954441),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.343880434126331),
-                                    ("Christmas<time-of-day> am|pm", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("Christmas<time-of-day> am|pm", -6.345636360828596),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.343880434126331),
+                                     -6.345636360828596),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.6507332535663855),
-                                    ("intersectin|during <named-month>|year", -6.343880434126331),
-                                    ("<time-of-day> am|pmintersect", -5.091117465630963),
-                                    ("Earth Houryear (latent)", -6.343880434126331),
-                                    ("Octoberyear (latent)", -4.839803037350057),
-                                    ("intersect<time-of-day> am|pm", -6.343880434126331),
-                                    ("Mattu Pongalyear (latent)", -6.343880434126331),
-                                    ("Shavuotyear (latent)", -6.343880434126331),
-                                    ("Parsi New Yearyear (latent)", -5.427589702252176),
+                                     -5.652489180268651),
+                                    ("intersectin|during <named-month>|year", -6.345636360828596),
+                                    ("<time-of-day> am|pmintersect", -5.092873392333228),
+                                    ("Earth Houryear (latent)", -6.345636360828596),
+                                    ("Octoberyear (latent)", -4.841558964052322),
+                                    ("intersect<time-of-day> am|pm", -6.345636360828596),
+                                    ("Mattu Pongalyear (latent)", -6.345636360828596),
+                                    ("Shavuotyear (latent)", -6.345636360828596),
+                                    ("Parsi New Yearyear (latent)", -5.429345628954441),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.343880434126331),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.343880434126331),
-                                    ("todayin|within|after <duration>", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.345636360828596),
+                                    ("todayin|within|after <duration>", -6.345636360828596),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.938415326018166),
-                                    ("Marchyear (latent)", -6.343880434126331),
-                                    ("Sukkotyear (latent)", -5.938415326018166),
+                                     -5.940171252720432),
+                                    ("Marchyear (latent)", -6.345636360828596),
+                                    ("Sukkotyear (latent)", -5.940171252720432),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.938415326018166),
-                                    ("Clean Mondayyear (latent)", -5.938415326018166),
-                                    ("monthhour", -5.938415326018166),
+                                     -5.940171252720432),
+                                    ("Clean Mondayyear (latent)", -5.940171252720432),
+                                    ("monthhour", -5.940171252720432),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.6507332535663855),
-                                    ("todayat <time-of-day>", -6.343880434126331),
-                                    ("Thursday<time> timezone", -4.397970285071017),
-                                    ("time-of-day (latent)tonight", -5.938415326018166),
-                                    ("from|since|after <time>December", -6.343880434126331),
-                                    ("dd/mm<time-of-day> am|pm", -6.343880434126331),
-                                    ("<time-of-day> am|pmon <day>", -4.328977413584066),
+                                     -5.652489180268651),
+                                    ("todayat <time-of-day>", -6.345636360828596),
+                                    ("Thursday<time> timezone", -4.399726211773283),
+                                    ("time-of-day (latent)tonight", -5.940171252720432),
+                                    ("from|since|after <time>December", -6.345636360828596),
+                                    ("dd/mm<time-of-day> am|pm", -6.345636360828596),
+                                    ("<time-of-day> am|pmon <day>", -4.330733340286331),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.343880434126331),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.938415326018166),
-                                    ("dayday", -3.9015333987571266),
-                                    ("dd/mmat <time-of-day>", -6.343880434126331),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.343880434126331),
-                                    ("tonightat <time-of-day>", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.940171252720432),
+                                    ("dayday", -3.9032893254593914),
+                                    ("dd/mmat <time-of-day>", -6.345636360828596),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.345636360828596),
+                                    ("tonightat <time-of-day>", -6.345636360828596),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.6507332535663855),
+                                     -5.652489180268651),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.343880434126331),
-                                    ("today<time-of-day> am|pm", -6.343880434126331),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.938415326018166),
-                                    ("at <time-of-day><time> <part-of-day>", -6.343880434126331),
-                                    ("<day-of-month> (ordinal)intersect", -5.938415326018166),
-                                    ("hourhour", -4.264438892446495),
-                                    ("Navaratriin|during <named-month>|year", -6.343880434126331),
-                                    ("Wednesdaythis|last|next <cycle>", -6.343880434126331),
-                                    ("Lentyear (latent)", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("today<time-of-day> am|pm", -6.345636360828596),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.940171252720432),
+                                    ("at <time-of-day><time> <part-of-day>", -6.345636360828596),
+                                    ("<day-of-month> (ordinal)intersect", -5.940171252720432),
+                                    ("hourhour", -4.26619481914876),
+                                    ("Navaratriin|during <named-month>|year", -6.345636360828596),
+                                    ("Wednesdaythis|last|next <cycle>", -6.345636360828596),
+                                    ("Lentyear (latent)", -6.345636360828596),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.839803037350057),
-                                    ("Boghiyear (latent)", -6.343880434126331),
-                                    ("dayyear", -1.8953640581836164),
-                                    ("Thursdayfrom|since|after <time>", -5.938415326018166),
+                                     -4.841558964052322),
+                                    ("Boghiyear (latent)", -6.345636360828596),
+                                    ("dayyear", -1.8971199848858813),
+                                    ("Thursdayfrom|since|after <time>", -5.940171252720432),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.343880434126331),
-                                    ("Thursdayat <time-of-day>", -5.6507332535663855),
-                                    ("Islamic New Yearyear (latent)", -5.938415326018166),
-                                    ("Laylat al-Qadryear (latent)", -5.427589702252176),
-                                    ("Shrove Tuesdayyear (latent)", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("Thursdayat <time-of-day>", -5.652489180268651),
+                                    ("Islamic New Yearyear (latent)", -5.940171252720432),
+                                    ("Laylat al-Qadryear (latent)", -5.429345628954441),
+                                    ("Shrove Tuesdayyear (latent)", -6.345636360828596),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.6507332535663855),
-                                    ("<time-of-day> am|pmtomorrow", -5.6507332535663855),
-                                    ("Yom Kippuryear (latent)", -6.343880434126331),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.938415326018166),
-                                    ("<part-of-day> of <time>year (latent)", -6.343880434126331),
-                                    ("minutehour", -5.245268145458221),
-                                    ("Kaanum Pongalyear (latent)", -5.938415326018166),
-                                    ("Maha Saptamiyear (latent)", -6.343880434126331),
+                                     -5.652489180268651),
+                                    ("<time-of-day> am|pmtomorrow", -5.652489180268651),
+                                    ("Yom Kippuryear (latent)", -6.345636360828596),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.940171252720432),
+                                    ("<part-of-day> of <time>year (latent)", -6.345636360828596),
+                                    ("minutehour", -5.092873392333228),
+                                    ("Kaanum Pongalyear (latent)", -5.940171252720432),
+                                    ("Maha Saptamiyear (latent)", -6.345636360828596),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.938415326018166),
-                                    ("time-of-day (latent)tomorrow", -5.427589702252176),
-                                    ("part of daysat <time-of-day>", -5.938415326018166),
+                                     -5.940171252720432),
+                                    ("time-of-day (latent)tomorrow", -5.429345628954441),
+                                    ("part of daysat <time-of-day>", -5.940171252720432),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.639132341887906),
-                                    ("for <duration> from <time>December", -6.343880434126331),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.343880434126331),
+                                     -4.640888268590171),
+                                    ("for <duration> from <time>December", -6.345636360828596),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.345636360828596),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.091117465630963),
-                                    ("time-of-day (latent)this <part-of-day>", -6.343880434126331),
-                                    ("Pentecostyear (latent)", -6.343880434126331),
+                                     -5.092873392333228),
+                                    ("time-of-day (latent)this <part-of-day>", -6.345636360828596),
+                                    ("Pentecostyear (latent)", -6.345636360828596),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.091117465630963),
-                                    ("<day-of-month> (ordinal)February", -6.343880434126331),
-                                    ("Eid al-Fitryear (latent)", -5.427589702252176),
+                                     -5.092873392333228),
+                                    ("<day-of-month> (ordinal)February", -6.345636360828596),
+                                    ("Eid al-Fitryear (latent)", -5.429345628954441),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.343880434126331),
-                                    ("Mondayin|during the <part-of-day>", -6.343880434126331),
-                                    ("Chhathin|during <named-month>|year", -6.343880434126331),
-                                    ("Diwaliin|during <named-month>|year", -6.343880434126331),
-                                    ("Vaisakhiin|during <named-month>|year", -6.343880434126331),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.091117465630963),
-                                    ("Raksha Bandhanyear (latent)", -6.343880434126331),
-                                    ("daysecond", -5.938415326018166),
+                                     -6.345636360828596),
+                                    ("Mondayin|during the <part-of-day>", -6.345636360828596),
+                                    ("Chhathin|during <named-month>|year", -6.345636360828596),
+                                    ("Diwaliin|during <named-month>|year", -6.345636360828596),
+                                    ("Vaisakhiin|during <named-month>|year", -6.345636360828596),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.092873392333228),
+                                    ("Raksha Bandhanyear (latent)", -6.345636360828596),
+                                    ("daysecond", -5.940171252720432),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.938415326018166),
-                                    ("Ashurayear (latent)", -6.343880434126331),
-                                    ("Tuesdayin|during <named-month>|year", -6.343880434126331),
-                                    ("Chinese New Yearyear (latent)", -6.343880434126331),
-                                    ("tomorrowintersect", -6.343880434126331),
-                                    ("Lag BaOmeryear (latent)", -6.343880434126331),
+                                     -5.940171252720432),
+                                    ("Ashurayear (latent)", -6.345636360828596),
+                                    ("Tuesdayin|during <named-month>|year", -6.345636360828596),
+                                    ("Chinese New Yearyear (latent)", -6.345636360828596),
+                                    ("tomorrowintersect", -6.345636360828596),
+                                    ("Lag BaOmeryear (latent)", -6.345636360828596),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.343880434126331),
-                                    ("Eid al-Adhayear (latent)", -4.20381427063006),
-                                    ("intersectin|during the <part-of-day>", -6.343880434126331),
-                                    ("Palm Sundayyear (latent)", -6.343880434126331),
-                                    ("Christmasat <time-of-day>", -6.343880434126331),
-                                    ("Passoveryear (latent)", -6.343880434126331),
-                                    ("Lazarus Saturdayyear (latent)", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("Eid al-Adhayear (latent)", -4.205570197332325),
+                                    ("intersectin|during the <part-of-day>", -6.345636360828596),
+                                    ("Palm Sundayyear (latent)", -6.345636360828596),
+                                    ("Christmasat <time-of-day>", -6.345636360828596),
+                                    ("Passoveryear (latent)", -6.345636360828596),
+                                    ("Lazarus Saturdayyear (latent)", -6.345636360828596),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.343880434126331),
-                                    ("Yom HaShoahyear (latent)", -5.938415326018166),
+                                     -6.345636360828596),
+                                    ("Yom HaShoahyear (latent)", -5.940171252720432),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.938415326018166),
+                                     -5.940171252720432),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.343880434126331),
-                                    ("Septemberyear (latent)", -5.938415326018166),
+                                     -6.345636360828596),
+                                    ("Septemberyear (latent)", -5.940171252720432),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.839803037350057),
-                                    ("Halloweenyear (latent)", -6.343880434126331),
+                                     -4.841558964052322),
+                                    ("Halloweenyear (latent)", -6.345636360828596),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.938415326018166),
+                                     -5.940171252720432),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.6507332535663855),
+                                     -5.652489180268651),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.343880434126331),
-                                    ("at <time-of-day>intersect", -5.938415326018166),
-                                    ("Rosh Hashanahyear (latent)", -5.6507332535663855),
-                                    ("Dhanterasyear (latent)", -6.343880434126331),
-                                    ("Tu BiShvatyear (latent)", -6.343880434126331),
-                                    ("<day-of-month> (ordinal)December", -5.6507332535663855),
-                                    ("Holiyear (latent)", -5.6507332535663855),
+                                     -6.345636360828596),
+                                    ("at <time-of-day>intersect", -5.940171252720432),
+                                    ("Rosh Hashanahyear (latent)", -5.652489180268651),
+                                    ("Dhanterasyear (latent)", -6.345636360828596),
+                                    ("Tu BiShvatyear (latent)", -6.345636360828596),
+                                    ("<day-of-month> (ordinal)December", -5.652489180268651),
+                                    ("Holiyear (latent)", -5.652489180268651),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.343880434126331),
-                                    ("Holika Dahanyear (latent)", -5.6507332535663855),
+                                     -6.345636360828596),
+                                    ("Holika Dahanyear (latent)", -5.652489180268651),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.343880434126331),
-                                    ("dayminute", -3.426109702042052),
-                                    ("Mawlidyear (latent)", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("dayminute", -3.4278656287443168),
+                                    ("Mawlidyear (latent)", -6.345636360828596),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.938415326018166),
+                                     -5.940171252720432),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.343880434126331),
-                                    ("Jumu'atul-Widayear (latent)", -5.427589702252176),
-                                    ("minuteday", -2.5152390376372358),
+                                     -6.345636360828596),
+                                    ("Jumu'atul-Widayear (latent)", -5.429345628954441),
+                                    ("minuteday", -2.5169949643395007),
                                     ("absorption of , after named dayintersect",
-                                     -6.343880434126331),
-                                    ("intersectyear (latent)", -6.343880434126331),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("intersectyear (latent)", -6.345636360828596),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.345636360828596),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.343880434126331),
+                                     -6.345636360828596),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.343880434126331),
+                                     -6.345636360828596),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.343880434126331),
-                                    ("Mothering Sundayyear (latent)", -5.938415326018166),
-                                    ("Boss's Dayyear (latent)", -5.938415326018166),
-                                    ("Global Youth Service Dayyear (latent)", -6.343880434126331),
-                                    ("Dhanterasin|during <named-month>|year", -6.343880434126331),
-                                    ("Tisha B'Avyear (latent)", -6.343880434126331),
-                                    ("Isra and Mi'rajyear (latent)", -5.427589702252176),
-                                    ("at <time-of-day>on <day>", -5.245268145458221),
+                                     -6.345636360828596),
+                                    ("Mothering Sundayyear (latent)", -5.940171252720432),
+                                    ("Boss's Dayyear (latent)", -5.940171252720432),
+                                    ("Global Youth Service Dayyear (latent)", -6.345636360828596),
+                                    ("Dhanterasin|during <named-month>|year", -6.345636360828596),
+                                    ("Tisha B'Avyear (latent)", -6.345636360828596),
+                                    ("Isra and Mi'rajyear (latent)", -5.429345628954441),
+                                    ("at <time-of-day>on <day>", -5.247024072160486),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.343880434126331),
+                                     -6.345636360828596),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.6507332535663855),
-                                    ("Christmasyear (latent)", -5.938415326018166),
-                                    ("Naraka Chaturdashiyear (latent)", -5.938415326018166),
-                                    ("Thai Pongalin|during <named-month>|year", -6.343880434126331),
-                                    ("dayweek", -6.343880434126331),
-                                    ("Easter Sundayyear (latent)", -5.6507332535663855),
+                                     -5.652489180268651),
+                                    ("Christmasyear (latent)", -5.940171252720432),
+                                    ("Naraka Chaturdashiyear (latent)", -5.940171252720432),
+                                    ("Thai Pongalin|during <named-month>|year", -6.345636360828596),
+                                    ("dayweek", -6.345636360828596),
+                                    ("Easter Sundayyear (latent)", -5.652489180268651),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.73444252169223),
-                                    ("weekyear", -5.245268145458221),
-                                    ("King's Dayyear (latent)", -4.839803037350057),
-                                    ("hh:mmin|during the <part-of-day>", -5.6507332535663855),
+                                     -4.736198448394496),
+                                    ("weekyear", -5.247024072160486),
+                                    ("King's Dayyear (latent)", -4.841558964052322),
+                                    ("hh:mmin|during the <part-of-day>", -5.429345628954441),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.938415326018166),
-                                    ("Hanukkahyear (latent)", -5.6507332535663855),
-                                    ("February<time> <part-of-day>", -6.343880434126331),
+                                     -5.940171252720432),
+                                    ("Hanukkahyear (latent)", -5.652489180268651),
+                                    ("February<time> <part-of-day>", -6.345636360828596),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.343880434126331),
-                                    ("Great Lentyear (latent)", -6.343880434126331),
-                                    ("tomorrowat <time-of-day>", -5.6507332535663855),
+                                     -6.345636360828596),
+                                    ("Great Lentyear (latent)", -6.345636360828596),
+                                    ("tomorrowat <time-of-day>", -5.652489180268651),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.343880434126331),
-                                    ("Vaisakhiyear (latent)", -5.6507332535663855),
+                                     -6.345636360828596),
+                                    ("Vaisakhiyear (latent)", -5.652489180268651),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.343880434126331),
-                                    ("last <cycle> of <time>year (latent)", -5.6507332535663855),
-                                    ("at <time-of-day>tomorrow", -5.938415326018166),
-                                    ("tomorrow<time-of-day> am|pm", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("last <cycle> of <time>year (latent)", -5.652489180268651),
+                                    ("at <time-of-day>tomorrow", -5.940171252720432),
+                                    ("tomorrow<time-of-day> am|pm", -6.345636360828596),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.343880434126331),
-                                    ("Diwaliyear (latent)", -6.343880434126331),
-                                    ("between <time> and <time>on <day>", -4.73444252169223),
-                                    ("Black Fridayyear (latent)", -5.938415326018166),
+                                     -6.345636360828596),
+                                    ("Diwaliyear (latent)", -6.345636360828596),
+                                    ("between <time> and <time>on <day>", -4.736198448394496),
+                                    ("Black Fridayyear (latent)", -5.940171252720432),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.343880434126331),
+                                     -6.345636360828596),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.343880434126331),
-                                    ("Chhathyear (latent)", -5.938415326018166),
-                                    ("Vasant Panchamiyear (latent)", -6.343880434126331),
-                                    ("Rabindra Jayantiyear (latent)", -5.091117465630963),
-                                    ("St Patrick's Dayyear (latent)", -6.343880434126331),
-                                    ("Thursday<time> (timezone)", -6.343880434126331),
+                                     -6.345636360828596),
+                                    ("Chhathyear (latent)", -5.940171252720432),
+                                    ("Vasant Panchamiyear (latent)", -6.345636360828596),
+                                    ("Rabindra Jayantiyear (latent)", -5.092873392333228),
+                                    ("St Patrick's Dayyear (latent)", -6.345636360828596),
+                                    ("Thursday<time> (timezone)", -6.345636360828596),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.343880434126331),
-                                    ("August Bank Holidayyear (latent)", -5.6507332535663855),
-                                    ("<datetime> - <datetime> (interval)July", -5.938415326018166),
+                                     -6.345636360828596),
+                                    ("August Bank Holidayyear (latent)", -5.652489180268651),
+                                    ("<datetime> - <datetime> (interval)July", -5.940171252720432),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.938415326018166),
-                                    ("Februaryintersect", -6.343880434126331),
-                                    ("Simchat Torahyear (latent)", -6.343880434126331),
-                                    ("minuteyear", -6.343880434126331)],
-                               n = 432},
+                                     -5.940171252720432),
+                                    ("Februaryintersect", -6.345636360828596),
+                                    ("Simchat Torahyear (latent)", -6.345636360828596),
+                                    ("minuteyear", -6.345636360828596)],
+                               n = 433},
                    koData =
-                     ClassData{prior = -0.9247059287994395, unseen = -6.736966958001855,
+                     ClassData{prior = -0.9239803887795737, unseen = -6.739336627357174,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)<time-of-day> - <time-of-day> (interval)",
-                                     -5.637167725574217),
-                                    ("hourday", -3.1522610757862166),
+                                     -5.639540205927847),
+                                    ("hourday", -3.154633556139847),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.042632833682381),
-                                    ("<day-of-month> (ordinal)August", -6.042632833682381),
-                                    ("dayhour", -3.368484184255853),
-                                    ("<time> timezoneyear (latent)", -6.042632833682381),
+                                     -6.045005314036012),
+                                    ("<day-of-month> (ordinal)August", -6.045005314036012),
+                                    ("dayhour", -3.370856664609483),
+                                    ("<time> timezoneyear (latent)", -6.045005314036012),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.126342101808226),
-                                    ("Tuesdayfrom|since|after <time>", -5.349485653122436),
-                                    ("daymonth", -3.5577261838943812),
-                                    ("monthyear", -4.789869865187013),
-                                    ("<time-of-day> am|pmyear (latent)", -5.349485653122436),
-                                    ("Thai Pongalyear (latent)", -5.349485653122436),
-                                    ("intersecthh:mm", -6.042632833682381),
+                                     -5.128714582161857),
+                                    ("Tuesdayfrom|since|after <time>", -5.351858133476067),
+                                    ("daymonth", -3.5600986642480117),
+                                    ("monthyear", -4.792242345540644),
+                                    ("<time-of-day> am|pmyear (latent)", -5.351858133476067),
+                                    ("Thai Pongalyear (latent)", -5.351858133476067),
+                                    ("intersecthh:mm", -6.045005314036012),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.637167725574217),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.042632833682381),
-                                    ("houryear", -4.65633847256249),
+                                     -5.639540205927847),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.045005314036012),
+                                    ("houryear", -4.658710952916121),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.042632833682381),
-                                    ("<day-of-month> (ordinal)October", -6.042632833682381),
+                                     -6.045005314036012),
+                                    ("<day-of-month> (ordinal)October", -6.045005314036012),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.349485653122436),
-                                    ("hournograin", -4.789869865187013),
-                                    ("<time-of-day> am|pmintersect", -4.789869865187013),
-                                    ("Octoberyear (latent)", -6.042632833682381),
+                                     -5.351858133476067),
+                                    ("hournograin", -4.792242345540644),
+                                    ("<time-of-day> am|pmintersect", -4.792242345540644),
+                                    ("Octoberyear (latent)", -6.045005314036012),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.637167725574217),
-                                    ("until <time>on <day>", -5.349485653122436),
-                                    ("time-of-day (latent)intersect", -5.349485653122436),
-                                    ("todayin <number> (implicit minutes)", -6.042632833682381),
+                                     -5.639540205927847),
+                                    ("until <time>on <day>", -5.351858133476067),
+                                    ("time-of-day (latent)intersect", -5.351858133476067),
+                                    ("todayin <number> (implicit minutes)", -6.045005314036012),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.349485653122436),
+                                     -5.351858133476067),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.042632833682381),
-                                    ("hh:mmon <day>", -3.600285798313177),
-                                    ("absorption of , after named dayJuly", -5.637167725574217),
-                                    ("from|since|after <time>July", -5.637167725574217),
+                                     -6.045005314036012),
+                                    ("hh:mmon <day>", -3.6026582786668073),
+                                    ("absorption of , after named dayJuly", -5.639540205927847),
+                                    ("from|since|after <time>July", -5.639540205927847),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.126342101808226),
-                                    ("Clean Mondayyear (latent)", -6.042632833682381),
-                                    ("monthhour", -6.042632833682381),
+                                     -5.128714582161857),
+                                    ("Clean Mondayyear (latent)", -6.045005314036012),
+                                    ("monthhour", -6.045005314036012),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.637167725574217),
-                                    ("hourmonth", -4.17083065678079),
-                                    ("todayat <time-of-day>", -6.042632833682381),
-                                    ("Bank Holidayyear (latent)", -5.349485653122436),
-                                    ("from|since|after <time>December", -6.042632833682381),
+                                     -5.639540205927847),
+                                    ("hourmonth", -4.17320313713442),
+                                    ("todayat <time-of-day>", -6.045005314036012),
+                                    ("Bank Holidayyear (latent)", -5.351858133476067),
+                                    ("from|since|after <time>December", -6.045005314036012),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.042632833682381),
-                                    ("<time-of-day> am|pmon <day>", -4.789869865187013),
-                                    ("Mondayyear (latent)", -5.349485653122436),
-                                    ("dayday", -4.65633847256249),
-                                    ("dd/mmat <time-of-day>", -5.637167725574217),
-                                    ("on <day>September", -5.637167725574217),
-                                    ("time-of-day (latent)September", -5.637167725574217),
-                                    ("hourhour", -5.126342101808226),
-                                    ("time-of-day (latent)on <day>", -3.600285798313177),
-                                    ("Thursdaydd/mm", -6.042632833682381),
+                                     -6.045005314036012),
+                                    ("<time-of-day> am|pmon <day>", -4.792242345540644),
+                                    ("Mondayyear (latent)", -5.351858133476067),
+                                    ("dayday", -4.658710952916121),
+                                    ("dd/mmat <time-of-day>", -5.639540205927847),
+                                    ("on <day>September", -5.639540205927847),
+                                    ("time-of-day (latent)September", -5.639540205927847),
+                                    ("hourhour", -4.946393025367902),
+                                    ("time-of-day (latent)on <day>", -3.6026582786668073),
+                                    ("Thursdaydd/mm", -6.045005314036012),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.637167725574217),
-                                    ("dayyear", -3.022207947538019),
-                                    ("New Year's Dayyear (latent)", -5.126342101808226),
-                                    ("time-of-day (latent)Sunday", -5.637167725574217),
-                                    ("Thursdayfrom|since|after <time>", -4.337884741443956),
-                                    ("Thursdayat <time-of-day>", -4.433194921248281),
+                                     -5.639540205927847),
+                                    ("dayyear", -3.024580427891649),
+                                    ("New Year's Dayyear (latent)", -5.128714582161857),
+                                    ("time-of-day (latent)Sunday", -5.639540205927847),
+                                    ("Thursdayfrom|since|after <time>", -4.340257221797587),
+                                    ("Thursdayat <time-of-day>", -4.4355674016019115),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.042632833682381),
-                                    ("Aprilyear (latent)", -6.042632833682381),
-                                    ("the <day-of-month> (ordinal)July", -6.042632833682381),
-                                    ("the <day-of-month> (number)July", -6.042632833682381),
-                                    ("monthminute", -6.042632833682381),
-                                    ("hourminute", -5.349485653122436),
-                                    ("<time-of-day> am|pmtomorrow", -6.042632833682381),
-                                    ("Thursdayhh:mm", -5.126342101808226),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.637167725574217),
-                                    ("minutemonth", -4.17083065678079),
-                                    ("time-of-day (latent)Friday", -5.637167725574217),
-                                    ("minutehour", -6.042632833682381),
-                                    ("Augustyear (latent)", -5.637167725574217),
-                                    ("week-endin|during <named-month>|year", -6.042632833682381),
-                                    ("time-of-day (latent)Tuesday", -5.637167725574217),
+                                     -6.045005314036012),
+                                    ("Aprilyear (latent)", -6.045005314036012),
+                                    ("the <day-of-month> (ordinal)July", -6.045005314036012),
+                                    ("the <day-of-month> (number)July", -6.045005314036012),
+                                    ("monthminute", -6.045005314036012),
+                                    ("hourminute", -5.351858133476067),
+                                    ("<time-of-day> am|pmtomorrow", -6.045005314036012),
+                                    ("Thursdayhh:mm", -5.128714582161857),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.639540205927847),
+                                    ("minutemonth", -4.17320313713442),
+                                    ("time-of-day (latent)Friday", -5.639540205927847),
+                                    ("minutehour", -6.045005314036012),
+                                    ("Augustyear (latent)", -5.639540205927847),
+                                    ("week-endin|during <named-month>|year", -6.045005314036012),
+                                    ("time-of-day (latent)Tuesday", -5.639540205927847),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.042632833682381),
+                                     -6.045005314036012),
                                     ("dd/mm<time-of-day> - <time-of-day> (interval)",
-                                     -5.637167725574217),
-                                    ("Sundayyear (latent)", -5.126342101808226),
-                                    ("Christmasat <time-of-day>", -6.042632833682381),
-                                    ("from|since|after <time>year (latent)", -4.944020545014272),
-                                    ("dd/mmyear (latent)", -6.042632833682381),
-                                    ("<duration> after|before|from <time>December",
-                                     -6.042632833682381),
-                                    ("yesterday<time-of-day> am|pm", -6.042632833682381),
-                                    ("<day-of-month> (ordinal)July", -5.349485653122436),
+                                     -5.639540205927847),
+                                    ("Sundayyear (latent)", -5.128714582161857),
+                                    ("Christmasat <time-of-day>", -6.045005314036012),
+                                    ("from|since|after <time>year (latent)", -4.946393025367902),
+                                    ("dd/mmyear (latent)", -6.045005314036012),
+                                    ("yesterday<time-of-day> am|pm", -6.045005314036012),
+                                    ("<day-of-month> (ordinal)July", -5.351858133476067),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.042632833682381),
+                                     -6.045005314036012),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.042632833682381),
+                                     -6.045005314036012),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.042632833682381),
-                                    ("at <time-of-day>intersect", -5.637167725574217),
-                                    ("hh:mmyear (latent)", -3.9631912920025454),
-                                    ("Holiyear (latent)", -6.042632833682381),
-                                    ("until <time><time-of-day> am|pm", -6.042632833682381),
+                                     -6.045005314036012),
+                                    ("at <time-of-day>intersect", -5.639540205927847),
+                                    ("hh:mmyear (latent)", -3.965563772356176),
+                                    ("Holiyear (latent)", -6.045005314036012),
+                                    ("until <time><time-of-day> am|pm", -6.045005314036012),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.042632833682381),
-                                    ("dayminute", -3.4399431482379974),
-                                    ("yyyy-mm-ddhh:mm", -5.637167725574217),
-                                    ("intersectfrom|since|after <time>", -5.637167725574217),
-                                    ("intersectSeptember", -4.538555436906107),
-                                    ("minuteday", -2.803954381518001),
+                                     -6.045005314036012),
+                                    ("dayminute", -3.4423156285916283),
+                                    ("yyyy-mm-ddhh:mm", -5.639540205927847),
+                                    ("intersectfrom|since|after <time>", -5.639540205927847),
+                                    ("intersectSeptember", -4.540927917259737),
+                                    ("minuteday", -2.8063268618716313),
                                     ("absorption of , after named dayintersect",
-                                     -6.042632833682381),
-                                    ("intersectyear (latent)", -6.042632833682381),
-                                    ("Februaryin|during the <part-of-day>", -6.042632833682381),
-                                    ("time-of-day (latent)July", -5.349485653122436),
-                                    ("Saturdayyear (latent)", -6.042632833682381),
-                                    ("at <time-of-day>on <day>", -5.637167725574217),
-                                    ("time-of-day (latent)<time-of-day> am|pm", -6.042632833682381),
+                                     -6.045005314036012),
+                                    ("intersectyear (latent)", -6.045005314036012),
+                                    ("Februaryin|during the <part-of-day>", -6.045005314036012),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -6.045005314036012),
+                                    ("time-of-day (latent)July", -5.351858133476067),
+                                    ("Saturdayyear (latent)", -6.045005314036012),
+                                    ("at <time-of-day>on <day>", -5.639540205927847),
+                                    ("time-of-day (latent)<time-of-day> am|pm", -6.045005314036012),
                                     ("absorption of , after named daySeptember",
-                                     -5.126342101808226),
-                                    ("Naraka Chaturdashiyear (latent)", -6.042632833682381),
-                                    ("from|since|after <time>on <day>", -5.126342101808226),
-                                    ("dayweek", -6.042632833682381),
-                                    ("Easter Sundayyear (latent)", -5.637167725574217),
-                                    ("time-of-day (latent)at <time-of-day>", -5.349485653122436),
-                                    ("Thursday<time-of-day> am|pm", -4.789869865187013),
-                                    ("weekyear", -5.637167725574217),
-                                    ("time-of-day (latent)Thursday", -5.637167725574217),
+                                     -5.128714582161857),
+                                    ("Naraka Chaturdashiyear (latent)", -6.045005314036012),
+                                    ("from|since|after <time>on <day>", -5.128714582161857),
+                                    ("dayweek", -6.045005314036012),
+                                    ("Easter Sundayyear (latent)", -5.639540205927847),
+                                    ("time-of-day (latent)at <time-of-day>", -5.351858133476067),
+                                    ("Thursday<time-of-day> am|pm", -4.792242345540644),
+                                    ("weekyear", -5.639540205927847),
+                                    ("time-of-day (latent)Thursday", -5.639540205927847),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.042632833682381),
-                                    ("<day-of-month> (ordinal)April", -6.042632833682381),
+                                     -6.045005314036012),
+                                    ("<day-of-month> (ordinal)April", -6.045005314036012),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.637167725574217),
+                                     -5.639540205927847),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.349485653122436),
-                                    ("Sundayfrom|since|after <time>", -6.042632833682381),
-                                    ("absorption of , after named dayFebruary", -5.126342101808226),
+                                     -5.351858133476067),
+                                    ("Sundayfrom|since|after <time>", -6.045005314036012),
+                                    ("absorption of , after named dayFebruary", -5.128714582161857),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.042632833682381),
+                                     -5.639540205927847),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.042632833682381),
-                                    ("tomorrowat <time-of-day>", -6.042632833682381),
-                                    ("daynograin", -5.637167725574217),
+                                     -6.045005314036012),
+                                    ("tomorrowat <time-of-day>", -6.045005314036012),
+                                    ("daynograin", -5.639540205927847),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.637167725574217),
-                                    ("last <cycle> of <time>year (latent)", -5.637167725574217),
-                                    ("tomorrow<time-of-day> am|pm", -6.042632833682381),
+                                     -5.639540205927847),
+                                    ("last <cycle> of <time>year (latent)", -5.639540205927847),
+                                    ("tomorrow<time-of-day> am|pm", -6.045005314036012),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.349485653122436),
-                                    ("Diwaliyear (latent)", -5.637167725574217),
+                                     -5.351858133476067),
+                                    ("Diwaliyear (latent)", -5.639540205927847),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.042632833682381),
-                                    ("Fridayyear (latent)", -5.637167725574217),
-                                    ("time-of-day (latent)April", -6.042632833682381),
-                                    ("minuteyear", -3.845408256346162)],
-                               n = 284}}),
+                                     -6.045005314036012),
+                                    ("Fridayyear (latent)", -5.639540205927847),
+                                    ("time-of-day (latent)April", -6.045005314036012),
+                                    ("minuteyear", -3.8477807366997925)],
+                               n = 285}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1638,19 +1641,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1909,16 +1912,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2141,8 +2144,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2172,19 +2175,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8488494510786225, unseen = -4.553876891600541,
+                     ClassData{prior = -0.8109302162163288, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5584536727552454, unseen = -4.836281906951478,
+                     ClassData{prior = -0.587786664902119, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.613980250454495e-2),
-                                    ("integer (0..19)", -2.7488721956224653)],
-                               n = 123}}),
+                                   [("integer (numeric)", -6.506359334706188e-2),
+                                    ("integer (0..19)", -2.7647455447787554)],
+                               n = 125}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2207,33 +2210,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2275,39 +2278,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.564520407322694,
+                     ClassData{prior = -0.24709679233670262,
+                               unseen = -5.645446897643238,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.6147714819602146),
-                                    ("integer after|past <hour-of-day>", -4.174387269895637),
-                                    ("at <time-of-day>", -2.3025850929940455),
-                                    ("<time-of-day> o'clock", -4.462069342347418),
-                                    ("half after|past <hour-of-day>", -4.462069342347418),
-                                    ("second", -4.867534450455582),
-                                    ("hh:mm:ss", -4.867534450455582),
-                                    ("<hour-of-day> <integer>", -3.951243718581427),
-                                    ("time-of-day (latent)", -1.6688613329049011),
-                                    ("hhmm (latent)", -4.867534450455582),
-                                    ("hh:mm", -2.382627800667582),
-                                    ("quarter after|past <hour-of-day>", -4.867534450455582),
-                                    ("until <time>", -4.174387269895637),
-                                    ("about|exactly <time-of-day>", -4.867534450455582),
-                                    ("hour", -1.2039728043259361),
-                                    ("<time-of-day> sharp|exactly", -4.867534450455582),
-                                    ("minute", -1.7764919970972666)],
-                               n = 121},
+                                   [("from|since|after <time>", -3.6959969218828004),
+                                    ("integer after|past <hour-of-day>", -4.255612709818223),
+                                    ("at <time-of-day>", -2.3838105329166317),
+                                    ("<time-of-day> o'clock", -4.543294782270004),
+                                    ("half after|past <hour-of-day>", -4.543294782270004),
+                                    ("second", -4.948759890378168),
+                                    ("hh:mm:ss", -4.948759890378168),
+                                    ("<hour-of-day> <integer>", -4.032469158504013),
+                                    ("time-of-day (latent)", -1.6716151573859919),
+                                    ("hhmm (latent)", -4.948759890378168),
+                                    ("hh:mm", -2.3097025607629096),
+                                    ("quarter after|past <hour-of-day>", -4.032469158504013),
+                                    ("until <time>", -4.255612709818223),
+                                    ("about|exactly <time-of-day>", -4.948759890378168),
+                                    ("hour", -1.2351878236738605),
+                                    ("<time-of-day> sharp|exactly", -4.948759890378168),
+                                    ("minute", -1.7100814382137877)],
+                               n = 132},
                    koData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.442651256490317,
+                     ClassData{prior = -1.518980802278849, unseen = -4.532599493153256,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.044522437723423),
-                                    ("from|since|after <time>", -3.332204510175204),
-                                    ("at <time-of-day>", -3.332204510175204),
-                                    ("time-of-day (latent)", -1.252762968495368),
-                                    ("hh:mm", -3.332204510175204),
-                                    ("until <time>", -3.7376696182833684),
-                                    ("hour", -1.0986122886681098), ("minute", -2.4849066497880004)],
-                               n = 33}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1354942159291497),
+                                    ("from|since|after <time>", -3.1354942159291497),
+                                    ("at <time-of-day>", -3.4231762883809305),
+                                    ("time-of-day (latent)", -1.2259517110447111),
+                                    ("hh:mm", -3.4231762883809305),
+                                    ("until <time>", -3.828641396489095),
+                                    ("hour", -1.0560526742493137), ("minute", -2.575878427993727)],
+                               n = 37}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2388,7 +2392,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2404,13 +2408,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2445,11 +2450,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.143420595963184e-2,
-                               unseen = -4.564348191467836,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 94},
+                     ClassData{prior = -8.617769624105227e-2,
+                               unseen = -4.624972813284271,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 100},
                    koData =
-                     ClassData{prior = -2.4375044108934163,
+                     ClassData{prior = -2.4941233048929243,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2523,16 +2528,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2874,41 +2927,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3367,12 +3385,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3605,11 +3623,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_IE.hs b/Duckling/Ranking/Classifiers/EN_IE.hs
index a8562c21..9669a318 100644
--- a/Duckling/Ranking/Classifiers/EN_IE.hs
+++ b/Duckling/Ranking/Classifiers/EN_IE.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
-                                    ("Thursdaydd/mm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
+                                    ("Thursdaydd/mm", -5.995207533386816),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_IN.hs b/Duckling/Ranking/Classifiers/EN_IN.hs
index 8690ecb0..11d38b78 100644
--- a/Duckling/Ranking/Classifiers/EN_IN.hs
+++ b/Duckling/Ranking/Classifiers/EN_IN.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
-                                    ("Thursdaydd/mm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
+                                    ("Thursdaydd/mm", -5.995207533386816),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_JM.hs b/Duckling/Ranking/Classifiers/EN_JM.hs
index 533a831d..105311c9 100644
--- a/Duckling/Ranking/Classifiers/EN_JM.hs
+++ b/Duckling/Ranking/Classifiers/EN_JM.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
-                                    ("Thursdaydd/mm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
+                                    ("Thursdaydd/mm", -5.995207533386816),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_NZ.hs b/Duckling/Ranking/Classifiers/EN_NZ.hs
index de76449b..acd00b36 100644
--- a/Duckling/Ranking/Classifiers/EN_NZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_NZ.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
-                                    ("Thursdaydd/mm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
+                                    ("Thursdaydd/mm", -5.995207533386816),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_PH.hs b/Duckling/Ranking/Classifiers/EN_PH.hs
index de4651de..d8fd39b7 100644
--- a/Duckling/Ranking/Classifiers/EN_PH.hs
+++ b/Duckling/Ranking/Classifiers/EN_PH.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 16}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("Thursdaymm/dd", -5.992713766508414),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("Thursdaymm/dd", -5.995207533386816),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_TT.hs b/Duckling/Ranking/Classifiers/EN_TT.hs
index 7c780e80..10075600 100644
--- a/Duckling/Ranking/Classifiers/EN_TT.hs
+++ b/Duckling/Ranking/Classifiers/EN_TT.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
-                                    ("Thursdaydd/mm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
+                                    ("Thursdaydd/mm", -5.995207533386816),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_US.hs b/Duckling/Ranking/Classifiers/EN_US.hs
index c7309e01..9049a943 100644
--- a/Duckling/Ranking/Classifiers/EN_US.hs
+++ b/Duckling/Ranking/Classifiers/EN_US.hs
@@ -87,11 +87,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5930018005812271, unseen = -6.056784013228625,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 425},
+                     ClassData{prior = -0.5928244589320762, unseen = -6.091309882077698,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 440},
                    koData =
-                     ClassData{prior = -0.8044493121322456, unseen = -5.846438775057725,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 344}}),
+                     ClassData{prior = -0.8046684549923526, unseen = -5.8805329864007,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 356}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -123,8 +123,8 @@ classifiers
                                n = 2}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -261,7 +261,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -282,54 +282,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -388,55 +392,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("Cyber Monday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -461,32 +463,32 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 19}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.14035735769492247,
-                               unseen = -5.075173815233827,
+                     ClassData{prior = -0.1466034741918754, unseen = -5.111987788356543,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.6826098411003407),
-                                    ("noon|midnight|EOD|end of day", -3.970291913552122),
-                                    ("integer after|past <hour-of-day>", -3.970291913552122),
-                                    ("half after|past <hour-of-day>", -4.375757021660286),
-                                    ("<hour-of-day> <integer>", -3.970291913552122),
-                                    ("time-of-day (latent)", -1.7366996920450277),
-                                    ("hhmm (latent)", -3.6826098411003407),
-                                    ("<time-of-day> am|pm", -1.8108076641987496),
-                                    ("hh:mm", -3.2771447329921766),
-                                    ("about|exactly <time-of-day>", -3.970291913552122),
-                                    ("hour", -1.1176604836388042),
-                                    ("<time-of-day> sharp|exactly", -4.375757021660286),
-                                    ("minute", -1.9334099862910819)],
-                               n = 73},
+                                   [("<time> timezone", -3.71965111278069),
+                                    ("noon|midnight|EOD|end of day", -4.007333185232471),
+                                    ("integer after|past <hour-of-day>", -3.71965111278069),
+                                    ("half after|past <hour-of-day>", -4.412798293340635),
+                                    ("<hour-of-day> <integer>", -3.71965111278069),
+                                    ("time-of-day (latent)", -1.7386496439141066),
+                                    ("hhmm (latent)", -3.71965111278069),
+                                    ("<time-of-day> am|pm", -1.8478489358790986),
+                                    ("hh:mm", -3.3141860046725258),
+                                    ("about|exactly <time-of-day>", -4.007333185232471),
+                                    ("hour", -1.1356535603484588),
+                                    ("<time-of-day> sharp|exactly", -4.412798293340635),
+                                    ("minute", -1.8870696490323797)],
+                               n = 76},
                    koData =
-                     ClassData{prior = -2.032921526044943, unseen = -3.58351893845611,
+                     ClassData{prior = -1.9924301646902063,
+                               unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.252762968495368),
-                                    ("<time-of-day> am|pm", -2.456735772821304),
-                                    ("hour", -1.0704414117014134)],
-                               n = 11}}),
+                                   [("time-of-day (latent)", -1.213022639845854),
+                                    ("<time-of-day> am|pm", -2.512305623976115),
+                                    ("hour", -1.0459685551826876)],
+                               n = 12}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -860,432 +862,429 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47217990866833115,
-                               unseen = -7.090076835776092,
+                     ClassData{prior = -0.4727173351173319, unseen = -7.091742115095153,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.396095974467569),
-                                    ("Father's Dayyear (latent)", -6.396095974467569),
+                                   [("Navaratriyear (latent)", -6.397762641520038),
+                                    ("Father's Dayyear (latent)", -6.397762641520038),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.396095974467569),
-                                    ("Ramadanyear (latent)", -5.479805242593414),
+                                     -6.397762641520038),
+                                    ("Ramadanyear (latent)", -5.481471909645883),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.3811929539253045),
-                                    ("Military Spouse Dayyear (latent)", -6.396095974467569),
-                                    ("Bhai Doojyear (latent)", -6.396095974467569),
-                                    ("hourday", -4.3811929539253045),
-                                    ("dayhour", -3.4516569953011285),
+                                     -4.382859620977774),
+                                    ("Military Spouse Dayyear (latent)", -6.397762641520038),
+                                    ("Bhai Doojyear (latent)", -6.397762641520038),
+                                    ("hourday", -4.382859620977774),
+                                    ("dayhour", -3.453323662353598),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.3811929539253045),
-                                    ("Martin Luther King's Dayyear (latent)", -5.990630866359405),
-                                    ("Shemini Atzeretyear (latent)", -6.396095974467569),
-                                    ("daymonth", -4.3811929539253045),
-                                    ("monthday", -5.990630866359405),
-                                    ("monthyear", -4.604336505239514),
-                                    ("Yom Ha'atzmautyear (latent)", -6.396095974467569),
-                                    ("Vijayadashamiyear (latent)", -6.396095974467569),
+                                     -4.382859620977774),
+                                    ("Martin Luther King's Dayyear (latent)", -5.9922975334118735),
+                                    ("Shemini Atzeretyear (latent)", -6.397762641520038),
+                                    ("daymonth", -4.382859620977774),
+                                    ("monthday", -5.9922975334118735),
+                                    ("monthyear", -4.606003172291984),
+                                    ("Yom Ha'atzmautyear (latent)", -6.397762641520038),
+                                    ("Vijayadashamiyear (latent)", -6.397762641520038),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -5.009801613347678),
-                                    ("Thanksgiving Dayyear (latent)", -5.29748368579946),
-                                    ("Thai Pongalyear (latent)", -5.702948793907623),
-                                    ("Thiru Onamyear (latent)", -5.702948793907623),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.396095974467569),
+                                     -5.011468280400147),
+                                    ("Thanksgiving Dayyear (latent)", -5.299150352851928),
+                                    ("Thai Pongalyear (latent)", -5.704615460960093),
+                                    ("Thiru Onamyear (latent)", -5.704615460960093),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.397762641520038),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.479805242593414),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.396095974467569),
-                                    ("Krishna Janmashtamiyear (latent)", -5.990630866359405),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.396095974467569),
-                                    ("houryear", -5.479805242593414),
+                                     -5.481471909645883),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.397762641520038),
+                                    ("Krishna Janmashtamiyear (latent)", -5.9922975334118735),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.397762641520038),
+                                    ("houryear", -5.481471909645883),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.396095974467569),
-                                    ("Christmas<time-of-day> am|pm", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("Christmas<time-of-day> am|pm", -6.397762641520038),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.396095974467569),
+                                     -6.397762641520038),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.702948793907623),
-                                    ("intersectin|during <named-month>|year", -6.396095974467569),
-                                    ("<time-of-day> am|pmintersect", -5.143333005972201),
-                                    ("Earth Houryear (latent)", -6.396095974467569),
-                                    ("Octoberyear (latent)", -4.892018577691295),
-                                    ("intersect<time-of-day> am|pm", -6.396095974467569),
-                                    ("Mattu Pongalyear (latent)", -6.396095974467569),
-                                    ("Daylight Saving Start Dayyear (latent)", -5.479805242593414),
-                                    ("Shavuotyear (latent)", -6.396095974467569),
-                                    ("Parsi New Yearyear (latent)", -5.479805242593414),
+                                     -5.704615460960093),
+                                    ("intersectin|during <named-month>|year", -6.397762641520038),
+                                    ("<time-of-day> am|pmintersect", -5.14499967302467),
+                                    ("Earth Houryear (latent)", -6.397762641520038),
+                                    ("Octoberyear (latent)", -4.893685244743764),
+                                    ("intersect<time-of-day> am|pm", -6.397762641520038),
+                                    ("Mattu Pongalyear (latent)", -6.397762641520038),
+                                    ("Daylight Saving Start Dayyear (latent)", -5.481471909645883),
+                                    ("Shavuotyear (latent)", -6.397762641520038),
+                                    ("Parsi New Yearyear (latent)", -5.481471909645883),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.396095974467569),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.396095974467569),
-                                    ("todayin|within|after <duration>", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.397762641520038),
+                                    ("todayin|within|after <duration>", -6.397762641520038),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.990630866359405),
-                                    ("Marchyear (latent)", -6.396095974467569),
-                                    ("Sukkotyear (latent)", -5.990630866359405),
+                                     -5.9922975334118735),
+                                    ("Marchyear (latent)", -6.397762641520038),
+                                    ("Sukkotyear (latent)", -5.9922975334118735),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.990630866359405),
-                                    ("Daylight Saving End Dayyear (latent)", -5.479805242593414),
-                                    ("Clean Mondayyear (latent)", -5.990630866359405),
-                                    ("monthhour", -5.990630866359405),
+                                     -5.9922975334118735),
+                                    ("Daylight Saving End Dayyear (latent)", -5.481471909645883),
+                                    ("Clean Mondayyear (latent)", -5.9922975334118735),
+                                    ("monthhour", -5.9922975334118735),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.702948793907623),
-                                    ("todayat <time-of-day>", -6.396095974467569),
-                                    ("Thursday<time> timezone", -4.450185825412255),
-                                    ("time-of-day (latent)tonight", -5.990630866359405),
-                                    ("from|since|after <time>December", -6.396095974467569),
+                                     -5.704615460960093),
+                                    ("todayat <time-of-day>", -6.397762641520038),
+                                    ("Thursday<time> timezone", -4.451852492464725),
+                                    ("time-of-day (latent)tonight", -5.9922975334118735),
+                                    ("from|since|after <time>December", -6.397762641520038),
                                     ("Emergency Medical Services for Children Dayyear (latent)",
-                                     -6.396095974467569),
-                                    ("<time-of-day> am|pmon <day>", -4.3811929539253045),
+                                     -6.397762641520038),
+                                    ("<time-of-day> am|pmon <day>", -4.382859620977774),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.396095974467569),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.990630866359405),
-                                    ("Tax Daythis|last|next <cycle>", -6.396095974467569),
-                                    ("dayday", -3.9537489390983644),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.396095974467569),
-                                    ("mm/ddat <time-of-day>", -6.396095974467569),
-                                    ("tonightat <time-of-day>", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.9922975334118735),
+                                    ("Tax Daythis|last|next <cycle>", -6.397762641520038),
+                                    ("dayday", -3.955415606150834),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.397762641520038),
+                                    ("mm/ddat <time-of-day>", -6.397762641520038),
+                                    ("tonightat <time-of-day>", -6.397762641520038),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.702948793907623),
+                                     -5.704615460960093),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.396095974467569),
-                                    ("today<time-of-day> am|pm", -6.396095974467569),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.990630866359405),
-                                    ("at <time-of-day><time> <part-of-day>", -6.396095974467569),
-                                    ("<day-of-month> (ordinal)intersect", -5.990630866359405),
-                                    ("mm/dd<time-of-day> am|pm", -6.396095974467569),
-                                    ("hourhour", -4.316654432787733),
-                                    ("Navaratriin|during <named-month>|year", -6.396095974467569),
-                                    ("Wednesdaythis|last|next <cycle>", -6.396095974467569),
-                                    ("Lentyear (latent)", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("today<time-of-day> am|pm", -6.397762641520038),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.9922975334118735),
+                                    ("at <time-of-day><time> <part-of-day>", -6.397762641520038),
+                                    ("<day-of-month> (ordinal)intersect", -5.9922975334118735),
+                                    ("mm/dd<time-of-day> am|pm", -6.397762641520038),
+                                    ("hourhour", -4.318321099840202),
+                                    ("Navaratriin|during <named-month>|year", -6.397762641520038),
+                                    ("Wednesdaythis|last|next <cycle>", -6.397762641520038),
+                                    ("Lentyear (latent)", -6.397762641520038),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.892018577691295),
-                                    ("Boghiyear (latent)", -6.396095974467569),
-                                    ("dayyear", -1.800976124332979),
-                                    ("Thursdayfrom|since|after <time>", -5.990630866359405),
+                                     -4.893685244743764),
+                                    ("Boghiyear (latent)", -6.397762641520038),
+                                    ("dayyear", -1.8026427913854484),
+                                    ("Thursdayfrom|since|after <time>", -5.9922975334118735),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.396095974467569),
-                                    ("Thursdayat <time-of-day>", -5.702948793907623),
-                                    ("Islamic New Yearyear (latent)", -5.990630866359405),
-                                    ("Laylat al-Qadryear (latent)", -5.479805242593414),
-                                    ("Shrove Tuesdayyear (latent)", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("Thursdayat <time-of-day>", -5.704615460960093),
+                                    ("Islamic New Yearyear (latent)", -5.9922975334118735),
+                                    ("Laylat al-Qadryear (latent)", -5.481471909645883),
+                                    ("Shrove Tuesdayyear (latent)", -6.397762641520038),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.702948793907623),
-                                    ("<time-of-day> am|pmtomorrow", -5.702948793907623),
-                                    ("Yom Kippuryear (latent)", -6.396095974467569),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.990630866359405),
-                                    ("<part-of-day> of <time>year (latent)", -6.396095974467569),
-                                    ("minutehour", -5.29748368579946),
-                                    ("Kaanum Pongalyear (latent)", -5.990630866359405),
-                                    ("Maha Saptamiyear (latent)", -6.396095974467569),
+                                     -5.704615460960093),
+                                    ("<time-of-day> am|pmtomorrow", -5.704615460960093),
+                                    ("Yom Kippuryear (latent)", -6.397762641520038),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.9922975334118735),
+                                    ("<part-of-day> of <time>year (latent)", -6.397762641520038),
+                                    ("minutehour", -5.14499967302467),
+                                    ("Kaanum Pongalyear (latent)", -5.9922975334118735),
+                                    ("Maha Saptamiyear (latent)", -6.397762641520038),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.990630866359405),
-                                    ("time-of-day (latent)tomorrow", -5.479805242593414),
-                                    ("part of daysat <time-of-day>", -5.990630866359405),
+                                     -5.9922975334118735),
+                                    ("time-of-day (latent)tomorrow", -5.481471909645883),
+                                    ("part of daysat <time-of-day>", -5.9922975334118735),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6913478822291435),
-                                    ("for <duration> from <time>December", -6.396095974467569),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.396095974467569),
+                                     -4.693014549281613),
+                                    ("for <duration> from <time>December", -6.397762641520038),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.397762641520038),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.143333005972201),
-                                    ("time-of-day (latent)this <part-of-day>", -6.396095974467569),
-                                    ("Pentecostyear (latent)", -6.396095974467569),
+                                     -5.14499967302467),
+                                    ("time-of-day (latent)this <part-of-day>", -6.397762641520038),
+                                    ("Pentecostyear (latent)", -6.397762641520038),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.143333005972201),
-                                    ("<day-of-month> (ordinal)February", -6.396095974467569),
-                                    ("Eid al-Fitryear (latent)", -5.479805242593414),
+                                     -5.14499967302467),
+                                    ("<day-of-month> (ordinal)February", -6.397762641520038),
+                                    ("Eid al-Fitryear (latent)", -5.481471909645883),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.396095974467569),
-                                    ("Mondayin|during the <part-of-day>", -6.396095974467569),
-                                    ("Chhathin|during <named-month>|year", -6.396095974467569),
-                                    ("Diwaliin|during <named-month>|year", -6.396095974467569),
-                                    ("Vaisakhiin|during <named-month>|year", -6.396095974467569),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.143333005972201),
-                                    ("Raksha Bandhanyear (latent)", -6.396095974467569),
-                                    ("daysecond", -5.990630866359405),
+                                     -6.397762641520038),
+                                    ("Mondayin|during the <part-of-day>", -6.397762641520038),
+                                    ("Chhathin|during <named-month>|year", -6.397762641520038),
+                                    ("Diwaliin|during <named-month>|year", -6.397762641520038),
+                                    ("Vaisakhiin|during <named-month>|year", -6.397762641520038),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.14499967302467),
+                                    ("Raksha Bandhanyear (latent)", -6.397762641520038),
+                                    ("daysecond", -5.9922975334118735),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.990630866359405),
-                                    ("Emancipation Dayyear (latent)", -5.702948793907623),
-                                    ("Ashurayear (latent)", -6.396095974467569),
-                                    ("Tuesdayin|during <named-month>|year", -6.396095974467569),
-                                    ("Chinese New Yearyear (latent)", -6.396095974467569),
-                                    ("tomorrowintersect", -6.396095974467569),
-                                    ("Lag BaOmeryear (latent)", -6.396095974467569),
+                                     -5.9922975334118735),
+                                    ("Emancipation Dayyear (latent)", -5.704615460960093),
+                                    ("Ashurayear (latent)", -6.397762641520038),
+                                    ("Tuesdayin|during <named-month>|year", -6.397762641520038),
+                                    ("Chinese New Yearyear (latent)", -6.397762641520038),
+                                    ("tomorrowintersect", -6.397762641520038),
+                                    ("Lag BaOmeryear (latent)", -6.397762641520038),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.396095974467569),
-                                    ("Eid al-Adhayear (latent)", -4.256029810971298),
-                                    ("intersectin|during the <part-of-day>", -6.396095974467569),
-                                    ("Palm Sundayyear (latent)", -6.396095974467569),
-                                    ("Christmasat <time-of-day>", -6.396095974467569),
-                                    ("Passoveryear (latent)", -6.396095974467569),
-                                    ("Lazarus Saturdayyear (latent)", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("Eid al-Adhayear (latent)", -4.257696478023767),
+                                    ("intersectin|during the <part-of-day>", -6.397762641520038),
+                                    ("Palm Sundayyear (latent)", -6.397762641520038),
+                                    ("Christmasat <time-of-day>", -6.397762641520038),
+                                    ("Passoveryear (latent)", -6.397762641520038),
+                                    ("Lazarus Saturdayyear (latent)", -6.397762641520038),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.396095974467569),
-                                    ("Cyber Mondayyear (latent)", -5.990630866359405),
-                                    ("Yom HaShoahyear (latent)", -5.990630866359405),
+                                     -6.397762641520038),
+                                    ("Cyber Mondayyear (latent)", -5.9922975334118735),
+                                    ("Yom HaShoahyear (latent)", -5.9922975334118735),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.990630866359405),
+                                     -5.9922975334118735),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.396095974467569),
-                                    ("Septemberyear (latent)", -5.990630866359405),
+                                     -6.397762641520038),
+                                    ("Septemberyear (latent)", -5.9922975334118735),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.892018577691295),
-                                    ("Halloweenyear (latent)", -6.396095974467569),
+                                     -4.893685244743764),
+                                    ("Halloweenyear (latent)", -6.397762641520038),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.990630866359405),
+                                     -5.9922975334118735),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.702948793907623),
+                                     -5.704615460960093),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.396095974467569),
-                                    ("at <time-of-day>intersect", -5.990630866359405),
-                                    ("Rosh Hashanahyear (latent)", -5.702948793907623),
-                                    ("Dhanterasyear (latent)", -6.396095974467569),
-                                    ("Tu BiShvatyear (latent)", -6.396095974467569),
-                                    ("<day-of-month> (ordinal)December", -5.702948793907623),
-                                    ("Holiyear (latent)", -5.702948793907623),
+                                     -6.397762641520038),
+                                    ("at <time-of-day>intersect", -5.9922975334118735),
+                                    ("Rosh Hashanahyear (latent)", -5.704615460960093),
+                                    ("Dhanterasyear (latent)", -6.397762641520038),
+                                    ("Tu BiShvatyear (latent)", -6.397762641520038),
+                                    ("<day-of-month> (ordinal)December", -5.704615460960093),
+                                    ("Holiyear (latent)", -5.704615460960093),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.396095974467569),
-                                    ("Holika Dahanyear (latent)", -5.702948793907623),
+                                     -6.397762641520038),
+                                    ("Holika Dahanyear (latent)", -5.704615460960093),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.396095974467569),
-                                    ("dayminute", -3.4783252423832898),
-                                    ("Mawlidyear (latent)", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("dayminute", -3.479991909435759),
+                                    ("Mawlidyear (latent)", -6.397762641520038),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.990630866359405),
+                                     -5.9922975334118735),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.396095974467569),
-                                    ("Jumu'atul-Widayear (latent)", -5.479805242593414),
-                                    ("minuteday", -2.567454577978474),
+                                     -6.397762641520038),
+                                    ("Jumu'atul-Widayear (latent)", -5.481471909645883),
+                                    ("minuteday", -2.569121245030943),
                                     ("absorption of , after named dayintersect",
-                                     -6.396095974467569),
-                                    ("intersectyear (latent)", -6.396095974467569),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("intersectyear (latent)", -6.397762641520038),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.397762641520038),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.396095974467569),
+                                     -6.397762641520038),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.396095974467569),
+                                     -6.397762641520038),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.396095974467569),
-                                    ("Boss's Dayyear (latent)", -5.990630866359405),
-                                    ("Global Youth Service Dayyear (latent)", -6.396095974467569),
-                                    ("Dhanterasin|during <named-month>|year", -6.396095974467569),
-                                    ("Tisha B'Avyear (latent)", -6.396095974467569),
-                                    ("Isra and Mi'rajyear (latent)", -5.479805242593414),
-                                    ("at <time-of-day>on <day>", -5.29748368579946),
+                                     -6.397762641520038),
+                                    ("Boss's Dayyear (latent)", -5.9922975334118735),
+                                    ("Global Youth Service Dayyear (latent)", -6.397762641520038),
+                                    ("Dhanterasin|during <named-month>|year", -6.397762641520038),
+                                    ("Tisha B'Avyear (latent)", -6.397762641520038),
+                                    ("Isra and Mi'rajyear (latent)", -5.481471909645883),
+                                    ("at <time-of-day>on <day>", -5.299150352851928),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.396095974467569),
+                                     -6.397762641520038),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.702948793907623),
-                                    ("Christmasyear (latent)", -5.990630866359405),
-                                    ("Naraka Chaturdashiyear (latent)", -5.990630866359405),
-                                    ("Thai Pongalin|during <named-month>|year", -6.396095974467569),
+                                     -5.704615460960093),
+                                    ("Christmasyear (latent)", -5.9922975334118735),
+                                    ("Naraka Chaturdashiyear (latent)", -5.9922975334118735),
+                                    ("Thai Pongalin|during <named-month>|year", -6.397762641520038),
                                     ("Emergency Medical Services Weekyear (latent)",
-                                     -6.396095974467569),
-                                    ("dayweek", -6.396095974467569),
-                                    ("Easter Sundayyear (latent)", -5.702948793907623),
+                                     -6.397762641520038),
+                                    ("dayweek", -6.397762641520038),
+                                    ("Easter Sundayyear (latent)", -5.704615460960093),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.786658062033468),
-                                    ("weekyear", -5.29748368579946),
-                                    ("King's Dayyear (latent)", -4.892018577691295),
-                                    ("hh:mmin|during the <part-of-day>", -5.702948793907623),
+                                     -4.788324729085938),
+                                    ("weekyear", -5.299150352851928),
+                                    ("King's Dayyear (latent)", -4.893685244743764),
+                                    ("hh:mmin|during the <part-of-day>", -5.481471909645883),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.990630866359405),
-                                    ("Hanukkahyear (latent)", -5.702948793907623),
-                                    ("February<time> <part-of-day>", -6.396095974467569),
-                                    ("National Grandparents Dayyear (latent)", -6.396095974467569),
+                                     -5.9922975334118735),
+                                    ("Hanukkahyear (latent)", -5.704615460960093),
+                                    ("February<time> <part-of-day>", -6.397762641520038),
+                                    ("National Grandparents Dayyear (latent)", -6.397762641520038),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.396095974467569),
-                                    ("Great Lentyear (latent)", -6.396095974467569),
-                                    ("tomorrowat <time-of-day>", -5.702948793907623),
+                                     -6.397762641520038),
+                                    ("Great Lentyear (latent)", -6.397762641520038),
+                                    ("tomorrowat <time-of-day>", -5.704615460960093),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.396095974467569),
-                                    ("Labor Dayyear (latent)", -6.396095974467569),
-                                    ("Vaisakhiyear (latent)", -5.702948793907623),
+                                     -6.397762641520038),
+                                    ("Labor Dayyear (latent)", -6.397762641520038),
+                                    ("Vaisakhiyear (latent)", -5.704615460960093),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.396095974467569),
-                                    ("last <cycle> of <time>year (latent)", -5.702948793907623),
-                                    ("at <time-of-day>tomorrow", -5.990630866359405),
-                                    ("tomorrow<time-of-day> am|pm", -6.396095974467569),
-                                    ("President's Dayyear (latent)", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("last <cycle> of <time>year (latent)", -5.704615460960093),
+                                    ("at <time-of-day>tomorrow", -5.9922975334118735),
+                                    ("tomorrow<time-of-day> am|pm", -6.397762641520038),
+                                    ("President's Dayyear (latent)", -6.397762641520038),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.396095974467569),
-                                    ("Diwaliyear (latent)", -6.396095974467569),
-                                    ("between <time> and <time>on <day>", -4.786658062033468),
-                                    ("Black Fridayyear (latent)", -5.990630866359405),
+                                     -6.397762641520038),
+                                    ("Diwaliyear (latent)", -6.397762641520038),
+                                    ("between <time> and <time>on <day>", -4.788324729085938),
+                                    ("Black Fridayyear (latent)", -5.9922975334118735),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.396095974467569),
+                                     -6.397762641520038),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.396095974467569),
-                                    ("Chhathyear (latent)", -5.990630866359405),
-                                    ("Vasant Panchamiyear (latent)", -6.396095974467569),
-                                    ("Tax Dayyear (latent)", -5.479805242593414),
-                                    ("Rabindra Jayantiyear (latent)", -5.143333005972201),
-                                    ("St Patrick's Dayyear (latent)", -6.396095974467569),
-                                    ("Thursday<time> (timezone)", -6.396095974467569),
+                                     -6.397762641520038),
+                                    ("Chhathyear (latent)", -5.9922975334118735),
+                                    ("Vasant Panchamiyear (latent)", -6.397762641520038),
+                                    ("Tax Dayyear (latent)", -5.481471909645883),
+                                    ("Rabindra Jayantiyear (latent)", -5.14499967302467),
+                                    ("St Patrick's Dayyear (latent)", -6.397762641520038),
+                                    ("Thursday<time> (timezone)", -6.397762641520038),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.396095974467569),
-                                    ("<datetime> - <datetime> (interval)July", -5.990630866359405),
+                                     -6.397762641520038),
+                                    ("<datetime> - <datetime> (interval)July", -5.9922975334118735),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.990630866359405),
-                                    ("Februaryintersect", -6.396095974467569),
-                                    ("Mother's Dayyear (latent)", -6.396095974467569),
-                                    ("Simchat Torahyear (latent)", -6.396095974467569),
-                                    ("minuteyear", -6.396095974467569)],
-                               n = 459},
+                                     -5.9922975334118735),
+                                    ("Februaryintersect", -6.397762641520038),
+                                    ("Mother's Dayyear (latent)", -6.397762641520038),
+                                    ("Simchat Torahyear (latent)", -6.397762641520038),
+                                    ("minuteyear", -6.397762641520038)],
+                               n = 460},
                    koData =
-                     ClassData{prior = -0.9772126125415378, unseen = -6.728628613084702,
+                     ClassData{prior = -0.9763227109098355, unseen = -6.731018100482083,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1439127863947456),
+                                   [("hourday", -3.146305132033365),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.0342845442909105),
-                                    ("<day-of-month> (ordinal)August", -6.0342845442909105),
-                                    ("dayhour", -3.3601358948643814),
-                                    ("<time> timezoneyear (latent)", -6.0342845442909105),
+                                     -6.03667688992953),
+                                    ("<day-of-month> (ordinal)August", -6.03667688992953),
+                                    ("dayhour", -3.3625282405030013),
+                                    ("<time> timezoneyear (latent)", -6.03667688992953),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.117993812416755),
-                                    ("Tuesdayfrom|since|after <time>", -5.341137363730965),
-                                    ("daymonth", -3.5493778945029097),
-                                    ("monthyear", -4.7815215757955425),
-                                    ("<time-of-day> am|pmyear (latent)", -5.341137363730965),
-                                    ("Thai Pongalyear (latent)", -5.341137363730965),
-                                    ("intersecthh:mm", -6.0342845442909105),
+                                     -5.120386158055375),
+                                    ("Tuesdayfrom|since|after <time>", -5.343529709369585),
+                                    ("daymonth", -3.5517702401415296),
+                                    ("monthyear", -4.783913921434162),
+                                    ("<time-of-day> am|pmyear (latent)", -5.343529709369585),
+                                    ("Thai Pongalyear (latent)", -5.343529709369585),
+                                    ("intersecthh:mm", -6.03667688992953),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.628819436182746),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.0342845442909105),
-                                    ("houryear", -4.64799018317102),
+                                     -5.631211781821365),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.03667688992953),
+                                    ("houryear", -4.650382528809639),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.0342845442909105),
-                                    ("<day-of-month> (ordinal)October", -6.0342845442909105),
+                                     -6.03667688992953),
+                                    ("<day-of-month> (ordinal)October", -6.03667688992953),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.341137363730965),
-                                    ("hournograin", -4.7815215757955425),
-                                    ("<time-of-day> am|pmintersect", -4.7815215757955425),
-                                    ("Octoberyear (latent)", -6.0342845442909105),
+                                     -5.343529709369585),
+                                    ("hournograin", -4.783913921434162),
+                                    ("<time-of-day> am|pmintersect", -4.783913921434162),
+                                    ("Octoberyear (latent)", -6.03667688992953),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.628819436182746),
-                                    ("until <time>on <day>", -5.341137363730965),
-                                    ("time-of-day (latent)intersect", -5.341137363730965),
-                                    ("todayin <number> (implicit minutes)", -6.0342845442909105),
+                                     -5.631211781821365),
+                                    ("until <time>on <day>", -5.343529709369585),
+                                    ("time-of-day (latent)intersect", -5.343529709369585),
+                                    ("todayin <number> (implicit minutes)", -6.03667688992953),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.341137363730965),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.0342845442909105),
-                                    ("hh:mmon <day>", -3.591937508921706),
-                                    ("absorption of , after named dayJuly", -5.628819436182746),
-                                    ("from|since|after <time>July", -5.628819436182746),
+                                     -5.343529709369585),
+                                    ("about|exactly <time-of-day>year (latent)", -6.03667688992953),
+                                    ("hh:mmon <day>", -3.5943298545603257),
+                                    ("absorption of , after named dayJuly", -5.631211781821365),
+                                    ("from|since|after <time>July", -5.631211781821365),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.117993812416755),
-                                    ("Clean Mondayyear (latent)", -6.0342845442909105),
-                                    ("monthhour", -6.0342845442909105),
+                                     -5.120386158055375),
+                                    ("Clean Mondayyear (latent)", -6.03667688992953),
+                                    ("monthhour", -6.03667688992953),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.628819436182746),
-                                    ("hourmonth", -4.162482367389319),
-                                    ("todayat <time-of-day>", -6.0342845442909105),
-                                    ("from|since|after <time>December", -6.0342845442909105),
+                                     -5.631211781821365),
+                                    ("hourmonth", -4.164874713027938),
+                                    ("todayat <time-of-day>", -6.03667688992953),
+                                    ("from|since|after <time>December", -6.03667688992953),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.0342845442909105),
-                                    ("<time-of-day> am|pmon <day>", -4.7815215757955425),
-                                    ("Mondayyear (latent)", -4.9356722556228005),
-                                    ("dayday", -4.64799018317102),
-                                    ("mm/ddat <time-of-day>", -5.628819436182746),
-                                    ("on <day>September", -5.628819436182746),
-                                    ("time-of-day (latent)September", -5.628819436182746),
-                                    ("hourhour", -6.0342845442909105),
-                                    ("time-of-day (latent)on <day>", -3.591937508921706),
+                                     -6.03667688992953),
+                                    ("<time-of-day> am|pmon <day>", -4.783913921434162),
+                                    ("Mondayyear (latent)", -4.93806460126142),
+                                    ("dayday", -4.650382528809639),
+                                    ("mm/ddat <time-of-day>", -5.631211781821365),
+                                    ("on <day>September", -5.631211781821365),
+                                    ("time-of-day (latent)September", -5.631211781821365),
+                                    ("hourhour", -5.631211781821365),
+                                    ("time-of-day (latent)on <day>", -3.5943298545603257),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.628819436182746),
-                                    ("dayyear", -3.0385522707369192),
-                                    ("Thursdaymm/dd", -6.0342845442909105),
-                                    ("New Year's Dayyear (latent)", -5.117993812416755),
-                                    ("time-of-day (latent)Sunday", -5.628819436182746),
-                                    ("Thursdayfrom|since|after <time>", -4.329536452052485),
-                                    ("Thursdayat <time-of-day>", -4.42484663185681),
+                                     -5.631211781821365),
+                                    ("dayyear", -3.040944616375539),
+                                    ("Thursdaymm/dd", -6.03667688992953),
+                                    ("New Year's Dayyear (latent)", -5.120386158055375),
+                                    ("time-of-day (latent)Sunday", -5.631211781821365),
+                                    ("Thursdayfrom|since|after <time>", -4.331928797691105),
+                                    ("Thursdayat <time-of-day>", -4.4272389774954295),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.0342845442909105),
-                                    ("Aprilyear (latent)", -6.0342845442909105),
-                                    ("the <day-of-month> (ordinal)July", -6.0342845442909105),
-                                    ("the <day-of-month> (number)July", -6.0342845442909105),
-                                    ("monthminute", -6.0342845442909105),
-                                    ("<time-of-day> am|pmtomorrow", -6.0342845442909105),
-                                    ("Thursdayhh:mm", -5.117993812416755),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.628819436182746),
-                                    ("minutemonth", -4.162482367389319),
-                                    ("time-of-day (latent)Friday", -5.628819436182746),
-                                    ("minutehour", -6.0342845442909105),
-                                    ("Augustyear (latent)", -5.628819436182746),
-                                    ("week-endin|during <named-month>|year", -6.0342845442909105),
-                                    ("time-of-day (latent)Tuesday", -5.628819436182746),
+                                     -6.03667688992953),
+                                    ("Aprilyear (latent)", -6.03667688992953),
+                                    ("the <day-of-month> (ordinal)July", -6.03667688992953),
+                                    ("the <day-of-month> (number)July", -6.03667688992953),
+                                    ("monthminute", -6.03667688992953),
+                                    ("<time-of-day> am|pmtomorrow", -6.03667688992953),
+                                    ("Thursdayhh:mm", -5.120386158055375),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.631211781821365),
+                                    ("minutemonth", -4.164874713027938),
+                                    ("time-of-day (latent)Friday", -5.631211781821365),
+                                    ("minutehour", -6.03667688992953),
+                                    ("Augustyear (latent)", -5.631211781821365),
+                                    ("week-endin|during <named-month>|year", -6.03667688992953),
+                                    ("time-of-day (latent)Tuesday", -5.631211781821365),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.628819436182746),
+                                     -5.631211781821365),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.0342845442909105),
-                                    ("Sundayyear (latent)", -5.117993812416755),
-                                    ("Christmasat <time-of-day>", -6.0342845442909105),
-                                    ("from|since|after <time>year (latent)", -4.9356722556228005),
-                                    ("<duration> after|before|from <time>December",
-                                     -6.0342845442909105),
-                                    ("yesterday<time-of-day> am|pm", -6.0342845442909105),
-                                    ("<day-of-month> (ordinal)July", -5.341137363730965),
+                                     -6.03667688992953),
+                                    ("Sundayyear (latent)", -5.120386158055375),
+                                    ("Christmasat <time-of-day>", -6.03667688992953),
+                                    ("from|since|after <time>year (latent)", -4.93806460126142),
+                                    ("yesterday<time-of-day> am|pm", -6.03667688992953),
+                                    ("<day-of-month> (ordinal)July", -5.343529709369585),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.0342845442909105),
-                                    ("mm/ddyear (latent)", -6.0342845442909105),
+                                     -6.03667688992953),
+                                    ("mm/ddyear (latent)", -6.03667688992953),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.0342845442909105),
+                                     -6.03667688992953),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.0342845442909105),
-                                    ("at <time-of-day>intersect", -5.628819436182746),
-                                    ("hh:mmyear (latent)", -3.9548430026110744),
-                                    ("Holiyear (latent)", -6.0342845442909105),
-                                    ("until <time><time-of-day> am|pm", -6.0342845442909105),
+                                     -6.03667688992953),
+                                    ("at <time-of-day>intersect", -5.631211781821365),
+                                    ("hh:mmyear (latent)", -3.9572353482496943),
+                                    ("Holiyear (latent)", -6.03667688992953),
+                                    ("until <time><time-of-day> am|pm", -6.03667688992953),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.0342845442909105),
-                                    ("dayminute", -3.4315948588465264),
-                                    ("yyyy-mm-ddhh:mm", -5.628819436182746),
-                                    ("intersectfrom|since|after <time>", -5.628819436182746),
-                                    ("intersectSeptember", -4.530207147514636),
-                                    ("minuteday", -2.7956060921265298),
-                                    ("absorption of , after named dayintersect",
-                                     -6.0342845442909105),
-                                    ("intersectyear (latent)", -6.0342845442909105),
-                                    ("Februaryin|during the <part-of-day>", -6.0342845442909105),
-                                    ("time-of-day (latent)July", -5.341137363730965),
-                                    ("Saturdayyear (latent)", -6.0342845442909105),
-                                    ("at <time-of-day>on <day>", -5.628819436182746),
+                                     -6.03667688992953),
+                                    ("dayminute", -3.4339872044851463),
+                                    ("yyyy-mm-ddhh:mm", -5.631211781821365),
+                                    ("intersectfrom|since|after <time>", -5.631211781821365),
+                                    ("intersectSeptember", -4.532599493153256),
+                                    ("minuteday", -2.7979984377651497),
+                                    ("absorption of , after named dayintersect", -6.03667688992953),
+                                    ("intersectyear (latent)", -6.03667688992953),
+                                    ("Februaryin|during the <part-of-day>", -6.03667688992953),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -6.03667688992953),
+                                    ("time-of-day (latent)July", -5.343529709369585),
+                                    ("Saturdayyear (latent)", -6.03667688992953),
+                                    ("at <time-of-day>on <day>", -5.631211781821365),
                                     ("absorption of , after named daySeptember",
-                                     -5.117993812416755),
-                                    ("Naraka Chaturdashiyear (latent)", -6.0342845442909105),
-                                    ("from|since|after <time>on <day>", -5.117993812416755),
-                                    ("dayweek", -6.0342845442909105),
-                                    ("Easter Sundayyear (latent)", -5.628819436182746),
-                                    ("Thursday<time-of-day> am|pm", -4.7815215757955425),
-                                    ("weekyear", -5.628819436182746),
-                                    ("time-of-day (latent)Thursday", -5.628819436182746),
+                                     -5.120386158055375),
+                                    ("Naraka Chaturdashiyear (latent)", -6.03667688992953),
+                                    ("from|since|after <time>on <day>", -5.120386158055375),
+                                    ("dayweek", -6.03667688992953),
+                                    ("Easter Sundayyear (latent)", -5.631211781821365),
+                                    ("Thursday<time-of-day> am|pm", -4.783913921434162),
+                                    ("weekyear", -5.631211781821365),
+                                    ("time-of-day (latent)Thursday", -5.631211781821365),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.0342845442909105),
-                                    ("<day-of-month> (ordinal)April", -6.0342845442909105),
+                                     -6.03667688992953),
+                                    ("<day-of-month> (ordinal)April", -6.03667688992953),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.628819436182746),
+                                     -5.631211781821365),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.341137363730965),
-                                    ("Sundayfrom|since|after <time>", -6.0342845442909105),
-                                    ("absorption of , after named dayFebruary", -5.117993812416755),
+                                     -5.343529709369585),
+                                    ("Sundayfrom|since|after <time>", -6.03667688992953),
+                                    ("absorption of , after named dayFebruary", -5.120386158055375),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.0342845442909105),
+                                     -5.631211781821365),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.0342845442909105),
-                                    ("tomorrowat <time-of-day>", -6.0342845442909105),
-                                    ("daynograin", -5.628819436182746),
+                                     -6.03667688992953),
+                                    ("tomorrowat <time-of-day>", -6.03667688992953),
+                                    ("daynograin", -5.631211781821365),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.628819436182746),
-                                    ("last <cycle> of <time>year (latent)", -5.628819436182746),
-                                    ("tomorrow<time-of-day> am|pm", -6.0342845442909105),
+                                     -5.631211781821365),
+                                    ("last <cycle> of <time>year (latent)", -5.631211781821365),
+                                    ("tomorrow<time-of-day> am|pm", -6.03667688992953),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.341137363730965),
-                                    ("Diwaliyear (latent)", -5.628819436182746),
+                                     -5.343529709369585),
+                                    ("Diwaliyear (latent)", -5.631211781821365),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.0342845442909105),
-                                    ("Fridayyear (latent)", -5.628819436182746),
-                                    ("time-of-day (latent)April", -6.0342845442909105),
-                                    ("minuteyear", -3.837059966954691)],
-                               n = 277}}),
+                                     -6.03667688992953),
+                                    ("Fridayyear (latent)", -5.631211781821365),
+                                    ("time-of-day (latent)April", -6.03667688992953),
+                                    ("minuteyear", -3.8394523125933104)],
+                               n = 278}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1684,19 +1683,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1976,16 +1975,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2222,8 +2221,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2253,19 +2252,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8441874379728111, unseen = -4.553876891600541,
+                     ClassData{prior = -0.8064758658669484, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.561954970288595, unseen = -4.8283137373023015,
+                     ClassData{prior = -0.5913644862500029, unseen = -4.844187086458591,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.669137449867228e-2),
-                                    ("integer (0..19)", -2.740840023925201)],
-                               n = 122}}),
+                                   [("integer (numeric)", -6.559728248581323e-2),
+                                    ("integer (0..19)", -2.7568403652716422)],
+                               n = 124}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2288,33 +2287,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11375888535665803,
-                               unseen = -5.241747015059643,
+                     ClassData{prior = -0.10763066419236544,
+                               unseen = -5.293304824724492,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.597384633214691),
-                                    ("integer (0..19)year (grain)", -3.0392173854937297),
-                                    ("integer (numeric)day (grain)", -2.597384633214691),
-                                    ("integer (0..19)second (grain) ", -3.8501476017100584),
-                                    ("integer (0..19)hour (grain)", -3.0392173854937297),
-                                    ("second", -3.4446824936018943),
-                                    ("integer (numeric)second (grain) ", -4.137829674161839),
-                                    ("integer (numeric)year (grain)", -3.1570004211501135),
-                                    ("day", -2.3460702049337847), ("year", -2.463853240590168),
-                                    ("integer (numeric)week (grain)", -3.1570004211501135),
-                                    ("integer (0..19)month (grain)", -3.6270040503958487),
-                                    ("integer (20..90)minute (grain)", -4.543294782270004),
-                                    ("hour", -2.6714926053684125), ("month", -3.2905318137746358),
-                                    ("integer (numeric)minute (grain)", -3.1570004211501135),
-                                    ("integer (0..19)minute (grain)", -3.1570004211501135),
-                                    ("integer (numeric)month (grain)", -4.137829674161839),
-                                    ("minute", -2.463853240590168),
-                                    ("integer (numeric)hour (grain)", -3.6270040503958487),
-                                    ("integer (0..19)day (grain)", -3.6270040503958487),
-                                    ("integer (0..19)week (grain)", -3.2905318137746358)],
-                               n = 83},
+                                   [("week", -2.649209701079277),
+                                    ("integer (0..19)year (grain)", -3.0910424533583156),
+                                    ("integer (numeric)day (grain)", -2.649209701079277),
+                                    ("integer (0..19)second (grain) ", -3.9019726695746444),
+                                    ("integer (0..19)hour (grain)", -3.0910424533583156),
+                                    ("second", -3.4965075614664802),
+                                    ("integer (numeric)second (grain) ", -4.189654742026425),
+                                    ("integer (numeric)year (grain)", -3.2088254890146994),
+                                    ("day", -2.3978952727983707), ("year", -2.515678308454754),
+                                    ("integer (numeric)week (grain)", -3.2088254890146994),
+                                    ("integer (0..19)month (grain)", -3.6788291182604347),
+                                    ("integer (20..90)minute (grain)", -4.59511985013459),
+                                    ("hour", -2.7233176732329984), ("month", -3.342356881639222),
+                                    ("integer (numeric)minute (grain)", -2.7233176732329984),
+                                    ("integer (0..19)minute (grain)", -3.2088254890146994),
+                                    ("integer (numeric)month (grain)", -4.189654742026425),
+                                    ("minute", -2.243744592971112),
+                                    ("integer (numeric)hour (grain)", -3.6788291182604347),
+                                    ("integer (0..19)day (grain)", -3.6788291182604347),
+                                    ("integer (0..19)week (grain)", -3.342356881639222)],
+                               n = 88},
                    koData =
-                     ClassData{prior = -2.2300144001592104,
+                     ClassData{prior = -2.2823823856765264,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2356,39 +2355,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.564520407322694,
+                     ClassData{prior = -0.24709679233670262,
+                               unseen = -5.645446897643238,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.6147714819602146),
-                                    ("integer after|past <hour-of-day>", -4.174387269895637),
-                                    ("at <time-of-day>", -2.3025850929940455),
-                                    ("<time-of-day> o'clock", -4.462069342347418),
-                                    ("half after|past <hour-of-day>", -4.462069342347418),
-                                    ("second", -4.867534450455582),
-                                    ("hh:mm:ss", -4.867534450455582),
-                                    ("<hour-of-day> <integer>", -3.951243718581427),
-                                    ("time-of-day (latent)", -1.6688613329049011),
-                                    ("hhmm (latent)", -4.867534450455582),
-                                    ("hh:mm", -2.382627800667582),
-                                    ("quarter after|past <hour-of-day>", -4.867534450455582),
-                                    ("until <time>", -4.174387269895637),
-                                    ("about|exactly <time-of-day>", -4.867534450455582),
-                                    ("hour", -1.2039728043259361),
-                                    ("<time-of-day> sharp|exactly", -4.867534450455582),
-                                    ("minute", -1.7764919970972666)],
-                               n = 121},
+                                   [("from|since|after <time>", -3.6959969218828004),
+                                    ("integer after|past <hour-of-day>", -4.255612709818223),
+                                    ("at <time-of-day>", -2.3838105329166317),
+                                    ("<time-of-day> o'clock", -4.543294782270004),
+                                    ("half after|past <hour-of-day>", -4.543294782270004),
+                                    ("second", -4.948759890378168),
+                                    ("hh:mm:ss", -4.948759890378168),
+                                    ("<hour-of-day> <integer>", -4.032469158504013),
+                                    ("time-of-day (latent)", -1.6716151573859919),
+                                    ("hhmm (latent)", -4.948759890378168),
+                                    ("hh:mm", -2.3097025607629096),
+                                    ("quarter after|past <hour-of-day>", -4.032469158504013),
+                                    ("until <time>", -4.255612709818223),
+                                    ("about|exactly <time-of-day>", -4.948759890378168),
+                                    ("hour", -1.2351878236738605),
+                                    ("<time-of-day> sharp|exactly", -4.948759890378168),
+                                    ("minute", -1.7100814382137877)],
+                               n = 132},
                    koData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.442651256490317,
+                     ClassData{prior = -1.518980802278849, unseen = -4.532599493153256,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.044522437723423),
-                                    ("from|since|after <time>", -3.332204510175204),
-                                    ("at <time-of-day>", -3.332204510175204),
-                                    ("time-of-day (latent)", -1.252762968495368),
-                                    ("hh:mm", -3.332204510175204),
-                                    ("until <time>", -3.7376696182833684),
-                                    ("hour", -1.0986122886681098), ("minute", -2.4849066497880004)],
-                               n = 33}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1354942159291497),
+                                    ("from|since|after <time>", -3.1354942159291497),
+                                    ("at <time-of-day>", -3.4231762883809305),
+                                    ("time-of-day (latent)", -1.2259517110447111),
+                                    ("hh:mm", -3.4231762883809305),
+                                    ("until <time>", -3.828641396489095),
+                                    ("hour", -1.0560526742493137), ("minute", -2.575878427993727)],
+                               n = 37}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2469,7 +2469,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2485,13 +2485,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2526,11 +2527,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.10109611687136875,
-                               unseen = -4.564348191467836,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 94},
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -4.624972813284271,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 100},
                    koData =
-                     ClassData{prior = -2.341805806147327, unseen = -2.4849066497880004,
+                     ClassData{prior = -2.3978952727983707,
+                               unseen = -2.4849066497880004,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
@@ -2603,16 +2605,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2988,41 +3038,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3504,12 +3519,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3755,11 +3770,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_XX.hs b/Duckling/Ranking/Classifiers/EN_XX.hs
index b9c718da..62360792 100644
--- a/Duckling/Ranking/Classifiers/EN_XX.hs
+++ b/Duckling/Ranking/Classifiers/EN_XX.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.6215486200116492, unseen = -5.991464547107982,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 398},
+                     ClassData{prior = -0.6203421401866395, unseen = -6.028278520230698,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 413},
                    koData =
-                     ClassData{prior = -0.770270178130147, unseen = -5.84354441703136,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 343}}),
+                     ClassData{prior = -0.7716719436722564, unseen = -5.877735781779639,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 355}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 3}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6945957207744071, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,55 +268,59 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
+                     ClassData{prior = -0.2029408439966903,
+                               unseen = -5.6240175061873385,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
-                                    ("week", -4.912654885736052),
+                                   [("<integer> to|till|before <hour-of-day>", -4.01096295328305),
+                                    ("week", -4.927253685157205),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.912654885736052),
-                                    ("today", -4.912654885736052),
-                                    ("intersect", -2.966744736680739),
-                                    ("<time> for <duration>", -4.219507705176107),
-                                    ("second", -4.912654885736052), ("now", -3.2079067934976266),
-                                    ("tomorrow", -4.507189777627888),
-                                    ("this|last|next <cycle>", -4.912654885736052),
-                                    ("day", -1.7991395765256777),
-                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
-                                    ("the <day-of-month> (number)", -3.5263605246161616),
-                                    ("time-of-day (latent)", -2.5147596129376812),
-                                    ("<time-of-day> am|pm", -4.507189777627888),
-                                    ("hh:mm", -4.507189777627888), ("nograin", -3.2079067934976266),
+                                     -4.927253685157205),
+                                    ("today", -4.927253685157205),
+                                    ("intersect", -2.981343536101891),
+                                    ("<time> for <duration>", -4.23410650459726),
+                                    ("second", -4.927253685157205), ("now", -3.2225055929187794),
+                                    ("tomorrow", -4.5217885770490405),
+                                    ("this|last|next <cycle>", -4.927253685157205),
+                                    ("day", -1.8137383759468302),
+                                    ("the <day-of-month> (ordinal)", -4.5217885770490405),
+                                    ("the <day-of-month> (number)", -3.5409593240373143),
+                                    ("time-of-day (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -4.23410650459726),
+                                    ("hh:mm", -4.5217885770490405),
+                                    ("nograin", -3.2225055929187794),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.507189777627888),
+                                     -4.5217885770490405),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.912654885736052),
-                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
-                                    ("Easter Sunday", -4.912654885736052),
-                                    ("Christmas", -4.219507705176107),
-                                    ("hour", -2.3869262414277963), ("month", -4.912654885736052),
-                                    ("<datetime> - <datetime> (interval)", -2.833213344056216),
+                                     -4.927253685157205),
+                                    ("<day-of-month> (ordinal)", -3.828641396489095),
+                                    ("Easter Sunday", -4.927253685157205),
+                                    ("Christmas", -4.23410650459726), ("hour", -2.324563999712821),
+                                    ("month", -4.927253685157205),
+                                    ("<datetime> - <datetime> (interval)", -2.847812143477369),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.966744736680739),
+                                     -2.981343536101891),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.507189777627888),
-                                    ("minute", -1.9682159065696114),
-                                    ("right now", -4.912654885736052),
-                                    ("<month> dd-dd (interval)", -4.219507705176107),
-                                    ("part of days", -4.912654885736052),
-                                    ("dd-dd <month> (interval)", -4.507189777627888)],
-                               n = 118}}),
+                                     -4.5217885770490405),
+                                    ("minute", -1.9828147059907641),
+                                    ("right now", -4.927253685157205),
+                                    ("<month> dd-dd (interval)", -4.23410650459726),
+                                    ("part of days", -4.927253685157205),
+                                    ("dd-dd <month> (interval)", -4.5217885770490405)],
+                               n = 120}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -376,55 +380,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -442,32 +444,32 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 19}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.14035735769492247,
-                               unseen = -5.075173815233827,
+                     ClassData{prior = -0.1466034741918754, unseen = -5.111987788356543,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.6826098411003407),
-                                    ("noon|midnight|EOD|end of day", -3.970291913552122),
-                                    ("integer after|past <hour-of-day>", -3.970291913552122),
-                                    ("half after|past <hour-of-day>", -4.375757021660286),
-                                    ("<hour-of-day> <integer>", -3.970291913552122),
-                                    ("time-of-day (latent)", -1.7366996920450277),
-                                    ("hhmm (latent)", -3.6826098411003407),
-                                    ("<time-of-day> am|pm", -1.8108076641987496),
-                                    ("hh:mm", -3.2771447329921766),
-                                    ("about|exactly <time-of-day>", -3.970291913552122),
-                                    ("hour", -1.1176604836388042),
-                                    ("<time-of-day> sharp|exactly", -4.375757021660286),
-                                    ("minute", -1.9334099862910819)],
-                               n = 73},
+                                   [("<time> timezone", -3.71965111278069),
+                                    ("noon|midnight|EOD|end of day", -4.007333185232471),
+                                    ("integer after|past <hour-of-day>", -3.71965111278069),
+                                    ("half after|past <hour-of-day>", -4.412798293340635),
+                                    ("<hour-of-day> <integer>", -3.71965111278069),
+                                    ("time-of-day (latent)", -1.7386496439141066),
+                                    ("hhmm (latent)", -3.71965111278069),
+                                    ("<time-of-day> am|pm", -1.8478489358790986),
+                                    ("hh:mm", -3.3141860046725258),
+                                    ("about|exactly <time-of-day>", -4.007333185232471),
+                                    ("hour", -1.1356535603484588),
+                                    ("<time-of-day> sharp|exactly", -4.412798293340635),
+                                    ("minute", -1.8870696490323797)],
+                               n = 76},
                    koData =
-                     ClassData{prior = -2.032921526044943, unseen = -3.58351893845611,
+                     ClassData{prior = -1.9924301646902063,
+                               unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.252762968495368),
-                                    ("<time-of-day> am|pm", -2.456735772821304),
-                                    ("hour", -1.0704414117014134)],
-                               n = 11}}),
+                                   [("time-of-day (latent)", -1.213022639845854),
+                                    ("<time-of-day> am|pm", -2.512305623976115),
+                                    ("hour", -1.0459685551826876)],
+                               n = 12}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -837,415 +839,414 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.49350714738949436,
-                               unseen = -7.029087564149662,
+                     ClassData{prior = -0.4940185054496094, unseen = -7.030857476116121,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.335054251498059),
+                                   [("Navaratriyear (latent)", -6.336825731146441),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.335054251498059),
-                                    ("Ramadanyear (latent)", -5.418763519623904),
+                                     -6.336825731146441),
+                                    ("Ramadanyear (latent)", -5.420534999272286),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.320151230955794),
-                                    ("Bhai Doojyear (latent)", -6.335054251498059),
-                                    ("hourday", -4.320151230955794),
-                                    ("dayhour", -3.3906152723316185),
+                                     -4.321922710604176),
+                                    ("Bhai Doojyear (latent)", -6.336825731146441),
+                                    ("hourday", -4.321922710604176),
+                                    ("dayhour", -3.3923867519800006),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.320151230955794),
-                                    ("Martin Luther King's Dayyear (latent)", -5.929589143389895),
-                                    ("Shemini Atzeretyear (latent)", -6.335054251498059),
-                                    ("daymonth", -4.1949880880017885),
-                                    ("monthday", -5.929589143389895),
-                                    ("monthyear", -4.4632520745964674),
-                                    ("Yom Ha'atzmautyear (latent)", -6.335054251498059),
-                                    ("Vijayadashamiyear (latent)", -6.335054251498059),
-                                    ("Thanksgiving Dayyear (latent)", -5.236441962829949),
-                                    ("Thai Pongalyear (latent)", -5.641907070938114),
-                                    ("Thiru Onamyear (latent)", -5.641907070938114),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.335054251498059),
+                                     -4.321922710604176),
+                                    ("Martin Luther King's Dayyear (latent)", -5.931360623038277),
+                                    ("Shemini Atzeretyear (latent)", -6.336825731146441),
+                                    ("daymonth", -4.1967595676501706),
+                                    ("monthday", -5.931360623038277),
+                                    ("monthyear", -4.4650235542448495),
+                                    ("Yom Ha'atzmautyear (latent)", -6.336825731146441),
+                                    ("Vijayadashamiyear (latent)", -6.336825731146441),
+                                    ("Thanksgiving Dayyear (latent)", -5.238213442478331),
+                                    ("Thai Pongalyear (latent)", -5.643678550586496),
+                                    ("Thiru Onamyear (latent)", -5.643678550586496),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.336825731146441),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.418763519623904),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.335054251498059),
-                                    ("Krishna Janmashtamiyear (latent)", -5.929589143389895),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.335054251498059),
-                                    ("houryear", -5.418763519623904),
+                                     -5.420534999272286),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.336825731146441),
+                                    ("Krishna Janmashtamiyear (latent)", -5.931360623038277),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.336825731146441),
+                                    ("houryear", -5.420534999272286),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.335054251498059),
-                                    ("Christmas<time-of-day> am|pm", -6.335054251498059),
-                                    ("<day-of-month> (ordinal)October", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("Christmas<time-of-day> am|pm", -6.336825731146441),
+                                    ("<day-of-month> (ordinal)October", -6.336825731146441),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.335054251498059),
+                                     -6.336825731146441),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.641907070938114),
-                                    ("intersectin|during <named-month>|year", -6.335054251498059),
-                                    ("<time-of-day> am|pmintersect", -5.082291283002691),
-                                    ("Earth Houryear (latent)", -6.335054251498059),
-                                    ("Octoberyear (latent)", -4.725616339063959),
-                                    ("intersect<time-of-day> am|pm", -6.335054251498059),
-                                    ("Mattu Pongalyear (latent)", -6.335054251498059),
-                                    ("Shavuotyear (latent)", -6.335054251498059),
-                                    ("Parsi New Yearyear (latent)", -5.418763519623904),
+                                     -5.643678550586496),
+                                    ("intersectin|during <named-month>|year", -6.336825731146441),
+                                    ("<time-of-day> am|pmintersect", -5.084062762651073),
+                                    ("Earth Houryear (latent)", -6.336825731146441),
+                                    ("Octoberyear (latent)", -4.727387818712341),
+                                    ("intersect<time-of-day> am|pm", -6.336825731146441),
+                                    ("Mattu Pongalyear (latent)", -6.336825731146441),
+                                    ("Shavuotyear (latent)", -6.336825731146441),
+                                    ("Parsi New Yearyear (latent)", -5.420534999272286),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.335054251498059),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.335054251498059),
-                                    ("todayin|within|after <duration>", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.336825731146441),
+                                    ("todayin|within|after <duration>", -6.336825731146441),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.929589143389895),
-                                    ("Marchyear (latent)", -6.335054251498059),
-                                    ("Sukkotyear (latent)", -5.929589143389895),
+                                     -5.931360623038277),
+                                    ("Marchyear (latent)", -6.336825731146441),
+                                    ("Sukkotyear (latent)", -5.931360623038277),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.929589143389895),
-                                    ("Clean Mondayyear (latent)", -5.929589143389895),
-                                    ("monthhour", -5.929589143389895),
+                                     -5.931360623038277),
+                                    ("Clean Mondayyear (latent)", -5.931360623038277),
+                                    ("monthhour", -5.931360623038277),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.641907070938114),
-                                    ("todayat <time-of-day>", -6.335054251498059),
-                                    ("Thursday<time> timezone", -4.389144102442746),
-                                    ("time-of-day (latent)tonight", -5.929589143389895),
-                                    ("from|since|after <time>December", -6.335054251498059),
-                                    ("<time-of-day> am|pmon <day>", -4.320151230955794),
+                                     -5.643678550586496),
+                                    ("todayat <time-of-day>", -6.336825731146441),
+                                    ("Thursday<time> timezone", -4.390915582091128),
+                                    ("time-of-day (latent)tonight", -5.931360623038277),
+                                    ("from|since|after <time>December", -6.336825731146441),
+                                    ("<time-of-day> am|pmon <day>", -4.321922710604176),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.335054251498059),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.929589143389895),
-                                    ("dayday", -3.8927072161288545),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.335054251498059),
-                                    ("mm/ddat <time-of-day>", -6.335054251498059),
-                                    ("tonightat <time-of-day>", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.931360623038277),
+                                    ("dayday", -3.8944786957772366),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.336825731146441),
+                                    ("mm/ddat <time-of-day>", -6.336825731146441),
+                                    ("tonightat <time-of-day>", -6.336825731146441),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.641907070938114),
+                                     -5.643678550586496),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.335054251498059),
-                                    ("today<time-of-day> am|pm", -6.335054251498059),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.929589143389895),
-                                    ("at <time-of-day><time> <part-of-day>", -6.335054251498059),
-                                    ("<day-of-month> (ordinal)intersect", -5.641907070938114),
-                                    ("mm/dd<time-of-day> am|pm", -6.335054251498059),
-                                    ("hourhour", -4.255612709818223),
-                                    ("Navaratriin|during <named-month>|year", -6.335054251498059),
-                                    ("Wednesdaythis|last|next <cycle>", -6.335054251498059),
-                                    ("Lentyear (latent)", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("today<time-of-day> am|pm", -6.336825731146441),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.931360623038277),
+                                    ("at <time-of-day><time> <part-of-day>", -6.336825731146441),
+                                    ("<day-of-month> (ordinal)intersect", -5.643678550586496),
+                                    ("mm/dd<time-of-day> am|pm", -6.336825731146441),
+                                    ("hourhour", -4.257384189466605),
+                                    ("Navaratriin|during <named-month>|year", -6.336825731146441),
+                                    ("Wednesdaythis|last|next <cycle>", -6.336825731146441),
+                                    ("Lentyear (latent)", -6.336825731146441),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.830976854721785),
-                                    ("Boghiyear (latent)", -6.335054251498059),
-                                    ("dayyear", -1.910207619641249),
-                                    ("Thursdayfrom|since|after <time>", -5.929589143389895),
+                                     -4.832748334370167),
+                                    ("Boghiyear (latent)", -6.336825731146441),
+                                    ("dayyear", -1.9119790992896313),
+                                    ("Thursdayfrom|since|after <time>", -5.931360623038277),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.335054251498059),
-                                    ("Thursdayat <time-of-day>", -5.641907070938114),
-                                    ("Islamic New Yearyear (latent)", -5.929589143389895),
-                                    ("Laylat al-Qadryear (latent)", -5.418763519623904),
-                                    ("Shrove Tuesdayyear (latent)", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("Thursdayat <time-of-day>", -5.643678550586496),
+                                    ("Islamic New Yearyear (latent)", -5.931360623038277),
+                                    ("Laylat al-Qadryear (latent)", -5.420534999272286),
+                                    ("Shrove Tuesdayyear (latent)", -6.336825731146441),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.641907070938114),
-                                    ("<time-of-day> am|pmtomorrow", -5.641907070938114),
-                                    ("Yom Kippuryear (latent)", -6.335054251498059),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.929589143389895),
-                                    ("<part-of-day> of <time>year (latent)", -6.335054251498059),
-                                    ("minutehour", -5.236441962829949),
-                                    ("Kaanum Pongalyear (latent)", -5.929589143389895),
-                                    ("Maha Saptamiyear (latent)", -6.335054251498059),
+                                     -5.643678550586496),
+                                    ("<time-of-day> am|pmtomorrow", -5.643678550586496),
+                                    ("Yom Kippuryear (latent)", -6.336825731146441),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.931360623038277),
+                                    ("<part-of-day> of <time>year (latent)", -6.336825731146441),
+                                    ("minutehour", -5.084062762651073),
+                                    ("Kaanum Pongalyear (latent)", -5.931360623038277),
+                                    ("Maha Saptamiyear (latent)", -6.336825731146441),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.929589143389895),
-                                    ("time-of-day (latent)tomorrow", -5.418763519623904),
-                                    ("part of daysat <time-of-day>", -5.929589143389895),
+                                     -5.931360623038277),
+                                    ("time-of-day (latent)tomorrow", -5.420534999272286),
+                                    ("part of daysat <time-of-day>", -5.931360623038277),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.630306159259634),
-                                    ("for <duration> from <time>December", -6.335054251498059),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.335054251498059),
+                                     -4.632077638908016),
+                                    ("for <duration> from <time>December", -6.336825731146441),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.336825731146441),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.082291283002691),
-                                    ("time-of-day (latent)this <part-of-day>", -6.335054251498059),
-                                    ("Pentecostyear (latent)", -6.335054251498059),
+                                     -5.084062762651073),
+                                    ("time-of-day (latent)this <part-of-day>", -6.336825731146441),
+                                    ("Pentecostyear (latent)", -6.336825731146441),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.082291283002691),
-                                    ("<day-of-month> (ordinal)February", -6.335054251498059),
-                                    ("Eid al-Fitryear (latent)", -5.418763519623904),
+                                     -5.084062762651073),
+                                    ("<day-of-month> (ordinal)February", -6.336825731146441),
+                                    ("Eid al-Fitryear (latent)", -5.420534999272286),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.335054251498059),
-                                    ("Mondayin|during the <part-of-day>", -6.335054251498059),
-                                    ("Chhathin|during <named-month>|year", -6.335054251498059),
-                                    ("Diwaliin|during <named-month>|year", -6.335054251498059),
-                                    ("Vaisakhiin|during <named-month>|year", -6.335054251498059),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.082291283002691),
-                                    ("Raksha Bandhanyear (latent)", -6.335054251498059),
-                                    ("daysecond", -5.929589143389895),
+                                     -6.336825731146441),
+                                    ("Mondayin|during the <part-of-day>", -6.336825731146441),
+                                    ("Chhathin|during <named-month>|year", -6.336825731146441),
+                                    ("Diwaliin|during <named-month>|year", -6.336825731146441),
+                                    ("Vaisakhiin|during <named-month>|year", -6.336825731146441),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.084062762651073),
+                                    ("Raksha Bandhanyear (latent)", -6.336825731146441),
+                                    ("daysecond", -5.931360623038277),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.929589143389895),
-                                    ("Ashurayear (latent)", -6.335054251498059),
-                                    ("Tuesdayin|during <named-month>|year", -6.335054251498059),
-                                    ("Chinese New Yearyear (latent)", -6.335054251498059),
-                                    ("tomorrowintersect", -6.335054251498059),
-                                    ("Lag BaOmeryear (latent)", -6.335054251498059),
+                                     -5.931360623038277),
+                                    ("Ashurayear (latent)", -6.336825731146441),
+                                    ("Tuesdayin|during <named-month>|year", -6.336825731146441),
+                                    ("Chinese New Yearyear (latent)", -6.336825731146441),
+                                    ("tomorrowintersect", -6.336825731146441),
+                                    ("Lag BaOmeryear (latent)", -6.336825731146441),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.335054251498059),
-                                    ("Eid al-Adhayear (latent)", -4.1949880880017885),
-                                    ("intersectin|during the <part-of-day>", -6.335054251498059),
-                                    ("Palm Sundayyear (latent)", -6.335054251498059),
-                                    ("Christmasat <time-of-day>", -6.335054251498059),
-                                    ("Passoveryear (latent)", -6.335054251498059),
-                                    ("Lazarus Saturdayyear (latent)", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("Eid al-Adhayear (latent)", -4.1967595676501706),
+                                    ("intersectin|during the <part-of-day>", -6.336825731146441),
+                                    ("Palm Sundayyear (latent)", -6.336825731146441),
+                                    ("Christmasat <time-of-day>", -6.336825731146441),
+                                    ("Passoveryear (latent)", -6.336825731146441),
+                                    ("Lazarus Saturdayyear (latent)", -6.336825731146441),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -5.929589143389895),
-                                    ("Yom HaShoahyear (latent)", -5.929589143389895),
+                                     -5.931360623038277),
+                                    ("Yom HaShoahyear (latent)", -5.931360623038277),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.929589143389895),
+                                     -5.931360623038277),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.335054251498059),
-                                    ("Septemberyear (latent)", -5.929589143389895),
+                                     -6.336825731146441),
+                                    ("Septemberyear (latent)", -5.931360623038277),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.830976854721785),
-                                    ("Halloweenyear (latent)", -6.335054251498059),
+                                     -4.832748334370167),
+                                    ("Halloweenyear (latent)", -6.336825731146441),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.929589143389895),
+                                     -5.931360623038277),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.641907070938114),
+                                     -5.643678550586496),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.335054251498059),
-                                    ("at <time-of-day>intersect", -5.929589143389895),
-                                    ("Rosh Hashanahyear (latent)", -5.641907070938114),
-                                    ("Dhanterasyear (latent)", -6.335054251498059),
-                                    ("Tu BiShvatyear (latent)", -6.335054251498059),
-                                    ("<day-of-month> (ordinal)December", -5.641907070938114),
-                                    ("Holiyear (latent)", -5.641907070938114),
+                                     -6.336825731146441),
+                                    ("at <time-of-day>intersect", -5.931360623038277),
+                                    ("Rosh Hashanahyear (latent)", -5.643678550586496),
+                                    ("Dhanterasyear (latent)", -6.336825731146441),
+                                    ("Tu BiShvatyear (latent)", -6.336825731146441),
+                                    ("<day-of-month> (ordinal)December", -5.643678550586496),
+                                    ("Holiyear (latent)", -5.643678550586496),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.335054251498059),
-                                    ("Holika Dahanyear (latent)", -5.641907070938114),
+                                     -6.336825731146441),
+                                    ("Holika Dahanyear (latent)", -5.643678550586496),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.335054251498059),
-                                    ("dayminute", -3.41728351941378),
-                                    ("Mawlidyear (latent)", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("dayminute", -3.419054999062162),
+                                    ("Mawlidyear (latent)", -6.336825731146441),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.929589143389895),
+                                     -5.931360623038277),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.335054251498059),
-                                    ("Jumu'atul-Widayear (latent)", -5.418763519623904),
-                                    ("minuteday", -2.5064128550089637),
+                                     -6.336825731146441),
+                                    ("Jumu'atul-Widayear (latent)", -5.420534999272286),
+                                    ("minuteday", -2.508184334657346),
                                     ("absorption of , after named dayintersect",
-                                     -6.335054251498059),
-                                    ("intersectyear (latent)", -5.929589143389895),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("intersectyear (latent)", -5.931360623038277),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.336825731146441),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.335054251498059),
+                                     -6.336825731146441),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.335054251498059),
+                                     -6.336825731146441),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.335054251498059),
-                                    ("Boss's Dayyear (latent)", -5.929589143389895),
-                                    ("Global Youth Service Dayyear (latent)", -6.335054251498059),
-                                    ("Dhanterasin|during <named-month>|year", -6.335054251498059),
-                                    ("Tisha B'Avyear (latent)", -6.335054251498059),
-                                    ("Isra and Mi'rajyear (latent)", -5.418763519623904),
-                                    ("at <time-of-day>on <day>", -5.236441962829949),
+                                     -6.336825731146441),
+                                    ("Boss's Dayyear (latent)", -5.931360623038277),
+                                    ("Global Youth Service Dayyear (latent)", -6.336825731146441),
+                                    ("Dhanterasin|during <named-month>|year", -6.336825731146441),
+                                    ("Tisha B'Avyear (latent)", -6.336825731146441),
+                                    ("Isra and Mi'rajyear (latent)", -5.420534999272286),
+                                    ("at <time-of-day>on <day>", -5.238213442478331),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.335054251498059),
+                                     -6.336825731146441),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.641907070938114),
-                                    ("Christmasyear (latent)", -5.929589143389895),
-                                    ("Naraka Chaturdashiyear (latent)", -5.929589143389895),
-                                    ("Thai Pongalin|during <named-month>|year", -6.335054251498059),
-                                    ("dayweek", -6.335054251498059),
-                                    ("Easter Sundayyear (latent)", -5.641907070938114),
+                                     -5.643678550586496),
+                                    ("Christmasyear (latent)", -5.931360623038277),
+                                    ("Naraka Chaturdashiyear (latent)", -5.931360623038277),
+                                    ("Thai Pongalin|during <named-month>|year", -6.336825731146441),
+                                    ("dayweek", -6.336825731146441),
+                                    ("Easter Sundayyear (latent)", -5.643678550586496),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.725616339063959),
-                                    ("weekyear", -5.236441962829949),
-                                    ("King's Dayyear (latent)", -4.830976854721785),
-                                    ("hh:mmin|during the <part-of-day>", -5.641907070938114),
+                                     -4.727387818712341),
+                                    ("weekyear", -5.238213442478331),
+                                    ("King's Dayyear (latent)", -4.832748334370167),
+                                    ("hh:mmin|during the <part-of-day>", -5.420534999272286),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.929589143389895),
-                                    ("Hanukkahyear (latent)", -5.641907070938114),
-                                    ("February<time> <part-of-day>", -6.335054251498059),
+                                     -5.931360623038277),
+                                    ("Hanukkahyear (latent)", -5.643678550586496),
+                                    ("February<time> <part-of-day>", -6.336825731146441),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.335054251498059),
-                                    ("Great Lentyear (latent)", -6.335054251498059),
-                                    ("tomorrowat <time-of-day>", -5.641907070938114),
+                                     -6.336825731146441),
+                                    ("Great Lentyear (latent)", -6.336825731146441),
+                                    ("tomorrowat <time-of-day>", -5.643678550586496),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.335054251498059),
-                                    ("Vaisakhiyear (latent)", -5.641907070938114),
+                                     -6.336825731146441),
+                                    ("Vaisakhiyear (latent)", -5.643678550586496),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.335054251498059),
-                                    ("last <cycle> of <time>year (latent)", -5.641907070938114),
-                                    ("at <time-of-day>tomorrow", -5.929589143389895),
-                                    ("tomorrow<time-of-day> am|pm", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("last <cycle> of <time>year (latent)", -5.643678550586496),
+                                    ("at <time-of-day>tomorrow", -5.931360623038277),
+                                    ("tomorrow<time-of-day> am|pm", -6.336825731146441),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.335054251498059),
-                                    ("Diwaliyear (latent)", -6.335054251498059),
-                                    ("between <time> and <time>on <day>", -4.725616339063959),
-                                    ("Black Fridayyear (latent)", -5.929589143389895),
+                                     -6.336825731146441),
+                                    ("Diwaliyear (latent)", -6.336825731146441),
+                                    ("between <time> and <time>on <day>", -4.727387818712341),
+                                    ("Black Fridayyear (latent)", -5.931360623038277),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.335054251498059),
+                                     -6.336825731146441),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.335054251498059),
-                                    ("Chhathyear (latent)", -5.929589143389895),
-                                    ("Vasant Panchamiyear (latent)", -6.335054251498059),
-                                    ("Rabindra Jayantiyear (latent)", -5.082291283002691),
-                                    ("St Patrick's Dayyear (latent)", -6.335054251498059),
-                                    ("Thursday<time> (timezone)", -6.335054251498059),
+                                     -6.336825731146441),
+                                    ("Chhathyear (latent)", -5.931360623038277),
+                                    ("Vasant Panchamiyear (latent)", -6.336825731146441),
+                                    ("Rabindra Jayantiyear (latent)", -5.084062762651073),
+                                    ("St Patrick's Dayyear (latent)", -6.336825731146441),
+                                    ("Thursday<time> (timezone)", -6.336825731146441),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.335054251498059),
-                                    ("<datetime> - <datetime> (interval)July", -5.929589143389895),
+                                     -6.336825731146441),
+                                    ("<datetime> - <datetime> (interval)July", -5.931360623038277),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.929589143389895),
-                                    ("Februaryintersect", -6.335054251498059),
-                                    ("Simchat Torahyear (latent)", -6.335054251498059),
-                                    ("minuteyear", -6.335054251498059)],
-                               n = 431},
+                                     -5.931360623038277),
+                                    ("Februaryintersect", -6.336825731146441),
+                                    ("Simchat Torahyear (latent)", -6.336825731146441),
+                                    ("minuteyear", -6.336825731146441)],
+                               n = 432},
                    koData =
-                     ClassData{prior = -0.9428441398266708, unseen = -6.705639094860003,
+                     ClassData{prior = -0.9420432279765697, unseen = -6.70808408385307,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.120895416507997),
+                                   [("hourday", -3.123343398146637),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.0112671744041615),
-                                    ("<day-of-month> (ordinal)August", -6.0112671744041615),
-                                    ("dayhour", -3.337118524977633),
-                                    ("<time> timezoneyear (latent)", -6.0112671744041615),
+                                     -6.013715156042802),
+                                    ("<day-of-month> (ordinal)August", -6.013715156042802),
+                                    ("dayhour", -3.339566506616273),
+                                    ("<time> timezoneyear (latent)", -6.013715156042802),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094976442530006),
-                                    ("Tuesdayfrom|since|after <time>", -5.318119993844216),
-                                    ("daymonth", -3.5263605246161616),
-                                    ("monthyear", -4.758504205908793),
-                                    ("<time-of-day> am|pmyear (latent)", -5.318119993844216),
-                                    ("Thai Pongalyear (latent)", -5.318119993844216),
-                                    ("intersecthh:mm", -6.0112671744041615),
+                                     -5.097424424168647),
+                                    ("Tuesdayfrom|since|after <time>", -5.320567975482857),
+                                    ("daymonth", -3.5288085062548014),
+                                    ("monthyear", -4.760952187547434),
+                                    ("<time-of-day> am|pmyear (latent)", -5.320567975482857),
+                                    ("Thai Pongalyear (latent)", -5.320567975482857),
+                                    ("intersecthh:mm", -6.013715156042802),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.605802066295998),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.0112671744041615),
-                                    ("houryear", -4.624972813284271),
+                                     -5.6082500479346375),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.013715156042802),
+                                    ("houryear", -4.627420794922911),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.0112671744041615),
-                                    ("<day-of-month> (ordinal)October", -6.0112671744041615),
+                                     -6.013715156042802),
+                                    ("<day-of-month> (ordinal)October", -6.013715156042802),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.318119993844216),
-                                    ("hournograin", -4.758504205908793),
-                                    ("<time-of-day> am|pmintersect", -4.758504205908793),
-                                    ("Octoberyear (latent)", -6.0112671744041615),
+                                     -5.320567975482857),
+                                    ("hournograin", -4.760952187547434),
+                                    ("<time-of-day> am|pmintersect", -4.760952187547434),
+                                    ("Octoberyear (latent)", -6.013715156042802),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.605802066295998),
-                                    ("until <time>on <day>", -5.318119993844216),
-                                    ("time-of-day (latent)intersect", -5.318119993844216),
-                                    ("todayin <number> (implicit minutes)", -6.0112671744041615),
+                                     -5.6082500479346375),
+                                    ("until <time>on <day>", -5.320567975482857),
+                                    ("time-of-day (latent)intersect", -5.320567975482857),
+                                    ("todayin <number> (implicit minutes)", -6.013715156042802),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.318119993844216),
+                                     -5.320567975482857),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.0112671744041615),
-                                    ("hh:mmon <day>", -3.568920139034957),
-                                    ("absorption of , after named dayJuly", -5.605802066295998),
-                                    ("from|since|after <time>July", -5.605802066295998),
+                                     -6.013715156042802),
+                                    ("hh:mmon <day>", -3.5713681206735974),
+                                    ("absorption of , after named dayJuly", -5.6082500479346375),
+                                    ("from|since|after <time>July", -5.6082500479346375),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.094976442530006),
-                                    ("Clean Mondayyear (latent)", -6.0112671744041615),
-                                    ("monthhour", -6.0112671744041615),
+                                     -5.097424424168647),
+                                    ("Clean Mondayyear (latent)", -6.013715156042802),
+                                    ("monthhour", -6.013715156042802),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.605802066295998),
-                                    ("hourmonth", -4.139464997502571),
-                                    ("todayat <time-of-day>", -6.0112671744041615),
-                                    ("from|since|after <time>December", -6.0112671744041615),
+                                     -5.6082500479346375),
+                                    ("hourmonth", -4.14191297914121),
+                                    ("todayat <time-of-day>", -6.013715156042802),
+                                    ("from|since|after <time>December", -6.013715156042802),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.0112671744041615),
-                                    ("<time-of-day> am|pmon <day>", -4.758504205908793),
-                                    ("Mondayyear (latent)", -5.318119993844216),
-                                    ("dayday", -4.624972813284271),
-                                    ("mm/ddat <time-of-day>", -5.605802066295998),
-                                    ("on <day>September", -5.605802066295998),
-                                    ("time-of-day (latent)September", -5.605802066295998),
-                                    ("hourhour", -6.0112671744041615),
-                                    ("time-of-day (latent)on <day>", -3.568920139034957),
+                                     -6.013715156042802),
+                                    ("<time-of-day> am|pmon <day>", -4.760952187547434),
+                                    ("Mondayyear (latent)", -5.320567975482857),
+                                    ("dayday", -4.627420794922911),
+                                    ("mm/ddat <time-of-day>", -5.6082500479346375),
+                                    ("on <day>September", -5.6082500479346375),
+                                    ("time-of-day (latent)September", -5.6082500479346375),
+                                    ("hourhour", -5.6082500479346375),
+                                    ("time-of-day (latent)on <day>", -3.5713681206735974),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.605802066295998),
-                                    ("dayyear", -3.066828195237721),
-                                    ("Thursdaymm/dd", -6.0112671744041615),
-                                    ("New Year's Dayyear (latent)", -5.094976442530006),
-                                    ("time-of-day (latent)Sunday", -5.605802066295998),
-                                    ("Thursdayfrom|since|after <time>", -4.306519082165736),
-                                    ("Thursdayat <time-of-day>", -4.401829261970061),
+                                     -5.6082500479346375),
+                                    ("dayyear", -3.0692761768763615),
+                                    ("Thursdaymm/dd", -6.013715156042802),
+                                    ("New Year's Dayyear (latent)", -5.097424424168647),
+                                    ("time-of-day (latent)Sunday", -5.6082500479346375),
+                                    ("Thursdayfrom|since|after <time>", -4.308967063804377),
+                                    ("Thursdayat <time-of-day>", -4.404277243608702),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.0112671744041615),
-                                    ("Aprilyear (latent)", -6.0112671744041615),
-                                    ("the <day-of-month> (ordinal)July", -6.0112671744041615),
-                                    ("the <day-of-month> (number)July", -6.0112671744041615),
-                                    ("monthminute", -6.0112671744041615),
-                                    ("<time-of-day> am|pmtomorrow", -6.0112671744041615),
-                                    ("Thursdayhh:mm", -5.094976442530006),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.605802066295998),
-                                    ("minutemonth", -4.139464997502571),
-                                    ("time-of-day (latent)Friday", -5.605802066295998),
-                                    ("minutehour", -6.0112671744041615),
-                                    ("Augustyear (latent)", -5.605802066295998),
-                                    ("week-endin|during <named-month>|year", -6.0112671744041615),
-                                    ("time-of-day (latent)Tuesday", -5.605802066295998),
+                                     -6.013715156042802),
+                                    ("Aprilyear (latent)", -6.013715156042802),
+                                    ("the <day-of-month> (ordinal)July", -6.013715156042802),
+                                    ("the <day-of-month> (number)July", -6.013715156042802),
+                                    ("monthminute", -6.013715156042802),
+                                    ("<time-of-day> am|pmtomorrow", -6.013715156042802),
+                                    ("Thursdayhh:mm", -5.097424424168647),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.6082500479346375),
+                                    ("minutemonth", -4.14191297914121),
+                                    ("time-of-day (latent)Friday", -5.6082500479346375),
+                                    ("minutehour", -6.013715156042802),
+                                    ("Augustyear (latent)", -5.6082500479346375),
+                                    ("week-endin|during <named-month>|year", -6.013715156042802),
+                                    ("time-of-day (latent)Tuesday", -5.6082500479346375),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.605802066295998),
+                                     -5.6082500479346375),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.0112671744041615),
-                                    ("Sundayyear (latent)", -5.094976442530006),
-                                    ("Christmasat <time-of-day>", -6.0112671744041615),
-                                    ("from|since|after <time>year (latent)", -4.912654885736052),
-                                    ("<duration> after|before|from <time>December",
-                                     -6.0112671744041615),
-                                    ("yesterday<time-of-day> am|pm", -6.0112671744041615),
-                                    ("<day-of-month> (ordinal)July", -5.318119993844216),
+                                     -6.013715156042802),
+                                    ("Sundayyear (latent)", -5.097424424168647),
+                                    ("Christmasat <time-of-day>", -6.013715156042802),
+                                    ("from|since|after <time>year (latent)", -4.915102867374692),
+                                    ("yesterday<time-of-day> am|pm", -6.013715156042802),
+                                    ("<day-of-month> (ordinal)July", -5.320567975482857),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.0112671744041615),
-                                    ("mm/ddyear (latent)", -6.0112671744041615),
+                                     -6.013715156042802),
+                                    ("mm/ddyear (latent)", -6.013715156042802),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.0112671744041615),
+                                     -6.013715156042802),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.0112671744041615),
-                                    ("at <time-of-day>intersect", -5.605802066295998),
-                                    ("hh:mmyear (latent)", -3.9318256327243257),
-                                    ("Holiyear (latent)", -6.0112671744041615),
-                                    ("until <time><time-of-day> am|pm", -6.0112671744041615),
+                                     -6.013715156042802),
+                                    ("at <time-of-day>intersect", -5.6082500479346375),
+                                    ("hh:mmyear (latent)", -3.934273614362966),
+                                    ("Holiyear (latent)", -6.013715156042802),
+                                    ("until <time><time-of-day> am|pm", -6.013715156042802),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.0112671744041615),
-                                    ("dayminute", -3.4085774889597777),
-                                    ("yyyy-mm-ddhh:mm", -5.605802066295998),
-                                    ("intersectfrom|since|after <time>", -5.605802066295998),
-                                    ("intersectSeptember", -4.507189777627888),
-                                    ("minuteday", -2.772588722239781),
+                                     -6.013715156042802),
+                                    ("dayminute", -3.411025470598418),
+                                    ("yyyy-mm-ddhh:mm", -5.6082500479346375),
+                                    ("intersectfrom|since|after <time>", -5.6082500479346375),
+                                    ("intersectSeptember", -4.5096377592665275),
+                                    ("minuteday", -2.7750367038784214),
                                     ("absorption of , after named dayintersect",
-                                     -6.0112671744041615),
-                                    ("intersectyear (latent)", -6.0112671744041615),
-                                    ("Februaryin|during the <part-of-day>", -6.0112671744041615),
-                                    ("time-of-day (latent)July", -5.318119993844216),
-                                    ("Saturdayyear (latent)", -6.0112671744041615),
-                                    ("at <time-of-day>on <day>", -5.605802066295998),
+                                     -6.013715156042802),
+                                    ("intersectyear (latent)", -6.013715156042802),
+                                    ("Februaryin|during the <part-of-day>", -6.013715156042802),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -6.013715156042802),
+                                    ("time-of-day (latent)July", -5.320567975482857),
+                                    ("Saturdayyear (latent)", -6.013715156042802),
+                                    ("at <time-of-day>on <day>", -5.6082500479346375),
                                     ("absorption of , after named daySeptember",
-                                     -5.094976442530006),
-                                    ("Naraka Chaturdashiyear (latent)", -6.0112671744041615),
-                                    ("from|since|after <time>on <day>", -5.094976442530006),
-                                    ("dayweek", -6.0112671744041615),
-                                    ("Easter Sundayyear (latent)", -5.605802066295998),
-                                    ("Thursday<time-of-day> am|pm", -4.758504205908793),
-                                    ("weekyear", -5.605802066295998),
-                                    ("time-of-day (latent)Thursday", -5.605802066295998),
+                                     -5.097424424168647),
+                                    ("Naraka Chaturdashiyear (latent)", -6.013715156042802),
+                                    ("from|since|after <time>on <day>", -5.097424424168647),
+                                    ("dayweek", -6.013715156042802),
+                                    ("Easter Sundayyear (latent)", -5.6082500479346375),
+                                    ("Thursday<time-of-day> am|pm", -4.760952187547434),
+                                    ("weekyear", -5.6082500479346375),
+                                    ("time-of-day (latent)Thursday", -5.6082500479346375),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.0112671744041615),
-                                    ("<day-of-month> (ordinal)April", -6.0112671744041615),
+                                     -6.013715156042802),
+                                    ("<day-of-month> (ordinal)April", -6.013715156042802),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.605802066295998),
+                                     -5.6082500479346375),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.318119993844216),
-                                    ("Sundayfrom|since|after <time>", -6.0112671744041615),
-                                    ("absorption of , after named dayFebruary", -5.094976442530006),
+                                     -5.320567975482857),
+                                    ("Sundayfrom|since|after <time>", -6.013715156042802),
+                                    ("absorption of , after named dayFebruary", -5.097424424168647),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.0112671744041615),
+                                     -5.6082500479346375),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.0112671744041615),
-                                    ("tomorrowat <time-of-day>", -6.0112671744041615),
-                                    ("daynograin", -5.605802066295998),
+                                     -6.013715156042802),
+                                    ("tomorrowat <time-of-day>", -6.013715156042802),
+                                    ("daynograin", -5.6082500479346375),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.605802066295998),
-                                    ("last <cycle> of <time>year (latent)", -5.605802066295998),
-                                    ("tomorrow<time-of-day> am|pm", -6.0112671744041615),
+                                     -5.6082500479346375),
+                                    ("last <cycle> of <time>year (latent)", -5.6082500479346375),
+                                    ("tomorrow<time-of-day> am|pm", -6.013715156042802),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.318119993844216),
-                                    ("Diwaliyear (latent)", -5.605802066295998),
+                                     -5.320567975482857),
+                                    ("Diwaliyear (latent)", -5.6082500479346375),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.0112671744041615),
-                                    ("Fridayyear (latent)", -5.605802066295998),
-                                    ("time-of-day (latent)April", -6.0112671744041615),
-                                    ("minuteyear", -3.8140425970679424)],
-                               n = 275}}),
+                                     -6.013715156042802),
+                                    ("Fridayyear (latent)", -5.6082500479346375),
+                                    ("time-of-day (latent)April", -6.013715156042802),
+                                    ("minuteyear", -3.816490578706582)],
+                               n = 276}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1618,19 +1619,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1889,16 +1890,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2114,8 +2115,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2145,19 +2146,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8441874379728111, unseen = -4.553876891600541,
+                     ClassData{prior = -0.8064758658669484, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.561954970288595, unseen = -4.8283137373023015,
+                     ClassData{prior = -0.5913644862500029, unseen = -4.844187086458591,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.669137449867228e-2),
-                                    ("integer (0..19)", -2.740840023925201)],
-                               n = 122}}),
+                                   [("integer (numeric)", -6.559728248581323e-2),
+                                    ("integer (0..19)", -2.7568403652716422)],
+                               n = 124}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2180,34 +2181,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11000089521432846,
-                               unseen = -5.272999558563747,
+                     ClassData{prior = -0.10426101032440939,
+                               unseen = -5.3230099791384085,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.62880082944807),
-                                    ("integer (0..19)year (grain)", -3.188416617383492),
-                                    ("integer (numeric)day (grain)", -2.62880082944807),
-                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
-                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
-                                    ("second", -3.4760986898352733),
-                                    ("integer (numeric)second (grain) ", -4.169245870395218),
-                                    ("integer (numeric)year (grain)", -3.0706335817271087),
-                                    ("day", -2.3774864011671633), ("year", -2.495269436823547),
-                                    ("integer (numeric)week (grain)", -3.188416617383492),
-                                    ("integer (0..19)month (grain)", -3.6584202466292277),
-                                    ("integer (20..90)minute (grain)", -4.574710978503383),
-                                    ("hour", -2.7029088016017915), ("month", -2.9652730660692823),
-                                    ("integer (numeric)minute (grain)", -3.188416617383492),
-                                    ("integer (0..19)minute (grain)", -3.188416617383492),
-                                    ("integer (numeric)month (grain)", -3.4760986898352733),
-                                    ("minute", -2.495269436823547),
-                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
-                                    ("integer (0..19)day (grain)", -3.6584202466292277),
-                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
-                               n = 86},
+                                   [("week", -2.6790626642289577),
+                                    ("integer (0..19)year (grain)", -3.2386784521643803),
+                                    ("integer (numeric)day (grain)", -2.6790626642289577),
+                                    ("integer (0..19)second (grain) ", -3.9318256327243257),
+                                    ("integer (0..19)hour (grain)", -3.120895416507997),
+                                    ("second", -3.5263605246161616),
+                                    ("integer (numeric)second (grain) ", -4.219507705176107),
+                                    ("integer (numeric)year (grain)", -3.120895416507997),
+                                    ("day", -2.4277482359480516), ("year", -2.5455312716044354),
+                                    ("integer (numeric)week (grain)", -3.2386784521643803),
+                                    ("integer (0..19)month (grain)", -3.708682081410116),
+                                    ("integer (20..90)minute (grain)", -4.624972813284271),
+                                    ("hour", -2.75317063638268), ("month", -3.0155349008501706),
+                                    ("integer (numeric)minute (grain)", -2.75317063638268),
+                                    ("integer (0..19)minute (grain)", -3.2386784521643803),
+                                    ("integer (numeric)month (grain)", -3.5263605246161616),
+                                    ("minute", -2.2735975561207935),
+                                    ("integer (numeric)hour (grain)", -3.708682081410116),
+                                    ("integer (0..19)day (grain)", -3.708682081410116),
+                                    ("integer (0..19)week (grain)", -3.372209844788903)],
+                               n = 91},
                    koData =
-                     ClassData{prior = -2.2617630984737906,
-                               unseen = -3.7612001156935624,
+                     ClassData{prior = -2.312535423847214, unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -1.3397743454849977),
@@ -2248,39 +2248,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.564520407322694,
+                     ClassData{prior = -0.24709679233670262,
+                               unseen = -5.645446897643238,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.6147714819602146),
-                                    ("integer after|past <hour-of-day>", -4.174387269895637),
-                                    ("at <time-of-day>", -2.3025850929940455),
-                                    ("<time-of-day> o'clock", -4.462069342347418),
-                                    ("half after|past <hour-of-day>", -4.462069342347418),
-                                    ("second", -4.867534450455582),
-                                    ("hh:mm:ss", -4.867534450455582),
-                                    ("<hour-of-day> <integer>", -3.951243718581427),
-                                    ("time-of-day (latent)", -1.6688613329049011),
-                                    ("hhmm (latent)", -4.867534450455582),
-                                    ("hh:mm", -2.382627800667582),
-                                    ("quarter after|past <hour-of-day>", -4.867534450455582),
-                                    ("until <time>", -4.174387269895637),
-                                    ("about|exactly <time-of-day>", -4.867534450455582),
-                                    ("hour", -1.2039728043259361),
-                                    ("<time-of-day> sharp|exactly", -4.867534450455582),
-                                    ("minute", -1.7764919970972666)],
-                               n = 121},
+                                   [("from|since|after <time>", -3.6959969218828004),
+                                    ("integer after|past <hour-of-day>", -4.255612709818223),
+                                    ("at <time-of-day>", -2.3838105329166317),
+                                    ("<time-of-day> o'clock", -4.543294782270004),
+                                    ("half after|past <hour-of-day>", -4.543294782270004),
+                                    ("second", -4.948759890378168),
+                                    ("hh:mm:ss", -4.948759890378168),
+                                    ("<hour-of-day> <integer>", -4.032469158504013),
+                                    ("time-of-day (latent)", -1.6716151573859919),
+                                    ("hhmm (latent)", -4.948759890378168),
+                                    ("hh:mm", -2.3097025607629096),
+                                    ("quarter after|past <hour-of-day>", -4.032469158504013),
+                                    ("until <time>", -4.255612709818223),
+                                    ("about|exactly <time-of-day>", -4.948759890378168),
+                                    ("hour", -1.2351878236738605),
+                                    ("<time-of-day> sharp|exactly", -4.948759890378168),
+                                    ("minute", -1.7100814382137877)],
+                               n = 132},
                    koData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.442651256490317,
+                     ClassData{prior = -1.518980802278849, unseen = -4.532599493153256,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.044522437723423),
-                                    ("from|since|after <time>", -3.332204510175204),
-                                    ("at <time-of-day>", -3.332204510175204),
-                                    ("time-of-day (latent)", -1.252762968495368),
-                                    ("hh:mm", -3.332204510175204),
-                                    ("until <time>", -3.7376696182833684),
-                                    ("hour", -1.0986122886681098), ("minute", -2.4849066497880004)],
-                               n = 33}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1354942159291497),
+                                    ("from|since|after <time>", -3.1354942159291497),
+                                    ("at <time-of-day>", -3.4231762883809305),
+                                    ("time-of-day (latent)", -1.2259517110447111),
+                                    ("hh:mm", -3.4231762883809305),
+                                    ("until <time>", -3.828641396489095),
+                                    ("hour", -1.0560526742493137), ("minute", -2.575878427993727)],
+                               n = 37}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2354,7 +2355,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.49247648509779407,
+                     ClassData{prior = -0.6931471805599453,
                                unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
@@ -2370,13 +2371,14 @@ classifiers
                                     ("day (grain)", -2.1972245773362196)],
                                n = 11},
                    koData =
-                     ClassData{prior = -0.9444616088408514, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2411,11 +2413,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.10109611687136875,
-                               unseen = -4.564348191467836,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 94},
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -4.624972813284271,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 100},
                    koData =
-                     ClassData{prior = -2.341805806147327, unseen = -2.4849066497880004,
+                     ClassData{prior = -2.3978952727983707,
+                               unseen = -2.4849066497880004,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
@@ -2488,16 +2491,66 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.6007738604289302, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.4011973816621555),
+                                    ("a <unit-of-duration>Christmas", -3.4011973816621555),
+                                    ("dayday", -3.4011973816621555),
+                                    ("<integer> <unit-of-duration>today", -3.4011973816621555),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.4849066497880004),
+                                    ("minutehour", -1.791759469228055),
+                                    ("daysecond", -3.4011973816621555),
+                                    ("a <unit-of-duration>right now", -3.4011973816621555),
+                                    ("minutenograin", -3.4011973816621555),
+                                    ("<integer> <unit-of-duration>Christmas", -3.4011973816621555),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.4011973816621555),
+                                    ("secondnograin", -3.4011973816621555),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.4849066497880004),
+                                    ("yearday", -2.70805020110221),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.4011973816621555),
+                                    ("daynograin", -3.4011973816621555),
+                                    ("<integer> <unit-of-duration>now", -2.995732273553991)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.7949298748698876, unseen = -4.007333185232471,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.6863989535702288),
+                                    ("dayhour", -3.295836866004329),
+                                    ("<integer> <unit-of-duration>intersect", -3.295836866004329),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.295836866004329),
+                                    ("monthnograin", -3.295836866004329),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.379546134130174),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.379546134130174),
+                                    ("dayday", -2.6026896854443837),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.295836866004329),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.295836866004329),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.295836866004329),
+                                    ("<integer> <unit-of-duration>now", -3.295836866004329)],
+                               n = 14}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2841,43 +2894,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.48550781578170077, unseen = -3.58351893845611,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.8622008809294686),
-                                    ("a <unit-of-duration>Christmas", -2.8622008809294686),
-                                    ("dayday", -2.8622008809294686),
-                                    ("<integer> <unit-of-duration>today", -2.8622008809294686),
-                                    ("daysecond", -2.8622008809294686),
-                                    ("a <unit-of-duration>right now", -2.8622008809294686),
-                                    ("minutenograin", -2.8622008809294686),
-                                    ("<integer> <unit-of-duration>Christmas", -2.8622008809294686),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.8622008809294686),
-                                    ("secondnograin", -2.8622008809294686),
-                                    ("yearday", -2.169053700369523),
-                                    ("daynograin", -2.8622008809294686),
-                                    ("<integer> <unit-of-duration>now", -2.456735772821304)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -0.9555114450274363,
-                               unseen = -3.4011973816621555,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.6741486494265287),
-                                    ("<integer> <unit-of-duration>intersect", -2.6741486494265287),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.6741486494265287),
-                                    ("monthnograin", -2.6741486494265287),
-                                    ("dayday", -1.9810014688665833),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.6741486494265287),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.6741486494265287),
-                                    ("<integer> <unit-of-duration>now", -2.6741486494265287)],
-                               n = 5}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3347,12 +3363,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3586,11 +3602,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/EN_ZA.hs b/Duckling/Ranking/Classifiers/EN_ZA.hs
index e6e20cc8..3c2cabd7 100644
--- a/Duckling/Ranking/Classifiers/EN_ZA.hs
+++ b/Duckling/Ranking/Classifiers/EN_ZA.hs
@@ -80,11 +80,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5966705175697593, unseen = -5.961005339623274,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 386},
+                     ClassData{prior = -0.5963396208901167, unseen = -5.998936561946683,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 401},
                    koData =
-                     ClassData{prior = -0.7999352482089571, unseen = -5.75890177387728,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 315}}),
+                     ClassData{prior = -0.8003408772994326, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -116,8 +116,8 @@ classifiers
                                n = 1}}),
        ("noon|midnight|EOD|end of day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -247,7 +247,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6739764335716716, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -268,54 +268,58 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.2076393647782445, unseen = -5.602118820879701,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.9889840465642745),
-                                    ("week", -4.90527477843843),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.90527477843843),
-                                    ("today", -4.90527477843843), ("intersect", -2.959364629383116),
-                                    ("<time> for <duration>", -4.212127597878484),
-                                    ("second", -4.90527477843843), ("now", -3.295836866004329),
-                                    ("tomorrow", -4.499809670330265),
-                                    ("this|last|next <cycle>", -4.90527477843843),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.499809670330265),
-                                    ("the <day-of-month> (number)", -3.518980417318539),
-                                    ("time-of-day (latent)", -2.507379505640059),
-                                    ("<time-of-day> am|pm", -4.499809670330265),
-                                    ("hh:mm", -4.499809670330265), ("nograin", -3.295836866004329),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125),
+                                    ("intersect", -2.9740707767728116),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.3105430133940246),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605),
+                                    ("nograin", -3.3105430133940246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.499809670330265),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.90527477843843),
-                                    ("<day-of-month> (ordinal)", -3.8066624897703196),
-                                    ("Easter Sunday", -4.90527477843843),
-                                    ("Christmas", -4.212127597878484), ("hour", -2.379546134130174),
-                                    ("month", -4.90527477843843),
-                                    ("<datetime> - <datetime> (interval)", -2.8258332367585934),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.840539384148289),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.959364629383116),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.499809670330265),
-                                    ("minute", -1.960835799271989),
-                                    ("right now", -4.90527477843843),
-                                    ("<month> dd-dd (interval)", -4.212127597878484),
-                                    ("part of days", -4.90527477843843),
-                                    ("dd-dd <month> (interval)", -4.499809670330265)],
-                               n = 117}}),
+                                     -4.5145158177199605),
+                                    ("minute", -1.9755419466616844),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour", -0.8109302162163288),
-                                    ("integer (numeric)time-of-day (latent)", -1.0986122886681098),
-                                    ("integer (20..90)time-of-day (latent)", -1.5040773967762742)],
-                               n = 3},
+                                   [("integer (numeric)noon|midnight|EOD|end of day",
+                                     -1.791759469228055),
+                                    ("hour", -0.8754687373538999),
+                                    ("integer (numeric)time-of-day (latent)", -1.3862943611198906),
+                                    ("integer (20..90)time-of-day (latent)", -1.791759469228055)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> last <cycle> of <time>",
         Classifier{okData =
@@ -374,55 +378,53 @@ classifiers
                                n = 11}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -4.59511985013459,
+                     ClassData{prior = -0.10265415406008334, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("dayhour", -1.493925025312256),
-                                    ("Mondayearly morning", -3.4863551900024623),
-                                    ("time-of-day (latent)tonight", -3.4863551900024623),
-                                    ("hourhour", -2.187072205872201),
+                                     -3.912023005428146),
+                                    ("dayhour", -1.5141277326297755),
+                                    ("Mondayearly morning", -3.506557897319982),
+                                    ("time-of-day (latent)tonight", -3.506557897319982),
+                                    ("hourhour", -2.2072749131897207),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("todaypart of days", -3.891820298110627),
-                                    ("minutehour", -2.793208009442517),
+                                     -3.912023005428146),
+                                    ("todaypart of days", -3.912023005428146),
+                                    ("minutehour", -2.659260036932778),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.4863551900024623),
-                                    ("time-of-day (latent)this <part-of-day>", -3.891820298110627),
-                                    ("Mondayin|during the <part-of-day>", -3.891820298110627),
-                                    ("intersectpart of days", -2.9755295662364714),
-                                    ("intersectin|during the <part-of-day>", -3.891820298110627),
+                                     -3.506557897319982),
+                                    ("time-of-day (latent)this <part-of-day>", -3.912023005428146),
+                                    ("Mondayin|during the <part-of-day>", -3.912023005428146),
+                                    ("intersectpart of days", -2.995732273553991),
+                                    ("intersectin|during the <part-of-day>", -3.912023005428146),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("tomorrowpart of days", -2.2823823856765264),
-                                    ("hh:mmin|during the <part-of-day>", -3.1986731175506815),
+                                     -3.912023005428146),
+                                    ("tomorrowpart of days", -2.3025850929940455),
+                                    ("hh:mmin|during the <part-of-day>", -2.995732273553991),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
+                                     -3.912023005428146),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("yesterdaypart of days", -3.4863551900024623),
+                                     -3.912023005428146),
+                                    ("yesterdaypart of days", -3.506557897319982),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -3.891820298110627),
-                                    ("Mondaypart of days", -3.891820298110627)],
-                               n = 36},
+                                     -3.912023005428146),
+                                    ("Mondaypart of days", -3.912023005428146)],
+                               n = 37},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -2.327277705584417, unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("monthhour", -2.772588722239781),
-                                    ("hourhour", -2.772588722239781),
+                                   [("yearhour", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -2.4277482359480516),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -2.772588722239781),
-                                    ("Februaryin|during the <part-of-day>", -2.772588722239781),
+                                     -2.833213344056216),
+                                    ("Februaryin|during the <part-of-day>", -2.833213344056216),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.772588722239781)],
-                               n = 3}}),
+                                     -2.4277482359480516)],
+                               n = 4}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -439,33 +441,32 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 16}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.13176927763112334,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.0875963352323845,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.657130755799356),
-                                    ("noon|midnight|EOD|end of day", -3.9448128282511368),
-                                    ("integer after|past <hour-of-day>", -3.9448128282511368),
-                                    ("half after|past <hour-of-day>", -4.350277936359301),
-                                    ("<hour-of-day> <integer>", -3.9448128282511368),
-                                    ("time-of-day (latent)", -1.7112206067440427),
-                                    ("hhmm (latent)", -3.657130755799356),
-                                    ("<time-of-day> am|pm", -1.824549292051046),
-                                    ("hh:mm", -3.4339872044851463),
-                                    ("about|exactly <time-of-day>", -3.9448128282511368),
-                                    ("hour", -1.0921813983378192),
-                                    ("<time-of-day> sharp|exactly", -4.350277936359301),
-                                    ("minute", -1.9989026791958235)],
-                               n = 71},
+                                   [("<time> timezone", -3.6951100038645723),
+                                    ("noon|midnight|EOD|end of day", -3.982792076316353),
+                                    ("integer after|past <hour-of-day>", -3.6951100038645723),
+                                    ("half after|past <hour-of-day>", -4.388257184424518),
+                                    ("<hour-of-day> <integer>", -3.6951100038645723),
+                                    ("time-of-day (latent)", -1.714108534997989),
+                                    ("hhmm (latent)", -3.6951100038645723),
+                                    ("<time-of-day> am|pm", -1.8625285401162623),
+                                    ("hh:mm", -3.4719664525503626),
+                                    ("about|exactly <time-of-day>", -3.982792076316353),
+                                    ("hour", -1.1111124514323412),
+                                    ("<time-of-day> sharp|exactly", -4.388257184424518),
+                                    ("minute", -1.9459101490553135)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -2.0918640616783932,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -2.044755983691946, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.2992829841302609),
-                                    ("<time-of-day> am|pm", -2.3978952727983707),
-                                    ("hour", -1.0986122886681098)],
-                               n = 10}}),
+                                   [("time-of-day (latent)", -1.252762968495368),
+                                    ("<time-of-day> am|pm", -2.456735772821304),
+                                    ("hour", -1.0704414117014134)],
+                               n = 11}}),
        ("December",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -831,405 +832,405 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4973703510915209, unseen = -7.003065458786462,
+                     ClassData{prior = -0.49788511249025597, unseen = -7.00488198971286,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.309008773843676),
+                                   [("Navaratriyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Ramadanyear (latent)", -5.392718041969521),
+                                     -6.310826956162734),
+                                    ("Ramadanyear (latent)", -5.394536224288579),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Bhai Doojyear (latent)", -6.309008773843676),
-                                    ("hourday", -4.2941057533014115),
-                                    ("dayhour", -3.3645697946772355),
+                                     -4.29592393562047),
+                                    ("Bhai Doojyear (latent)", -6.310826956162734),
+                                    ("hourday", -4.29592393562047), ("dayhour", -3.366387976996294),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -4.2941057533014115),
-                                    ("Martin Luther King's Dayyear (latent)", -5.903543665735512),
-                                    ("Shemini Atzeretyear (latent)", -6.309008773843676),
-                                    ("daymonth", -4.2941057533014115),
-                                    ("monthday", -5.903543665735512),
-                                    ("monthyear", -4.517249304615621),
-                                    ("Yom Ha'atzmautyear (latent)", -6.309008773843676),
-                                    ("Vijayadashamiyear (latent)", -6.309008773843676),
-                                    ("Thai Pongalyear (latent)", -5.61586159328373),
-                                    ("Thiru Onamyear (latent)", -5.61586159328373),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.309008773843676),
+                                     -4.29592393562047),
+                                    ("Martin Luther King's Dayyear (latent)", -5.905361848054571),
+                                    ("Shemini Atzeretyear (latent)", -6.310826956162734),
+                                    ("daymonth", -4.29592393562047),
+                                    ("monthday", -5.905361848054571),
+                                    ("monthyear", -4.51906748693468),
+                                    ("Yom Ha'atzmautyear (latent)", -6.310826956162734),
+                                    ("Vijayadashamiyear (latent)", -6.310826956162734),
+                                    ("Thai Pongalyear (latent)", -5.617679775602789),
+                                    ("Thiru Onamyear (latent)", -5.617679775602789),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.392718041969521),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.309008773843676),
-                                    ("Krishna Janmashtamiyear (latent)", -5.903543665735512),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.309008773843676),
-                                    ("houryear", -5.392718041969521),
+                                     -5.394536224288579),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.310826956162734),
+                                    ("Krishna Janmashtamiyear (latent)", -5.905361848054571),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.310826956162734),
+                                    ("houryear", -5.394536224288579),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("Christmas<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Christmas<time-of-day> am|pm", -6.310826956162734),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("intersectin|during <named-month>|year", -6.309008773843676),
-                                    ("<time-of-day> am|pmintersect", -5.056245805348308),
-                                    ("Earth Houryear (latent)", -6.309008773843676),
-                                    ("Octoberyear (latent)", -4.804931377067402),
-                                    ("intersect<time-of-day> am|pm", -6.309008773843676),
-                                    ("Mattu Pongalyear (latent)", -6.309008773843676),
-                                    ("Shavuotyear (latent)", -6.309008773843676),
-                                    ("Parsi New Yearyear (latent)", -5.392718041969521),
+                                     -5.617679775602789),
+                                    ("intersectin|during <named-month>|year", -6.310826956162734),
+                                    ("<time-of-day> am|pmintersect", -5.058063987667366),
+                                    ("Earth Houryear (latent)", -6.310826956162734),
+                                    ("Octoberyear (latent)", -4.806749559386461),
+                                    ("intersect<time-of-day> am|pm", -6.310826956162734),
+                                    ("Mattu Pongalyear (latent)", -6.310826956162734),
+                                    ("Shavuotyear (latent)", -6.310826956162734),
+                                    ("Parsi New Yearyear (latent)", -5.394536224288579),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.309008773843676),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.309008773843676),
-                                    ("todayin|within|after <duration>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.310826956162734),
+                                    ("todayin|within|after <duration>", -6.310826956162734),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.903543665735512),
-                                    ("Marchyear (latent)", -6.309008773843676),
-                                    ("Sukkotyear (latent)", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Marchyear (latent)", -6.310826956162734),
+                                    ("Sukkotyear (latent)", -5.905361848054571),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.903543665735512),
-                                    ("Clean Mondayyear (latent)", -5.903543665735512),
-                                    ("monthhour", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("Clean Mondayyear (latent)", -5.905361848054571),
+                                    ("monthhour", -5.905361848054571),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.61586159328373),
-                                    ("todayat <time-of-day>", -6.309008773843676),
-                                    ("Thursday<time> timezone", -4.363098624788362),
-                                    ("time-of-day (latent)tonight", -5.903543665735512),
-                                    ("from|since|after <time>December", -6.309008773843676),
-                                    ("<time-of-day> am|pmon <day>", -4.2941057533014115),
+                                     -5.617679775602789),
+                                    ("todayat <time-of-day>", -6.310826956162734),
+                                    ("Thursday<time> timezone", -4.364916807107421),
+                                    ("time-of-day (latent)tonight", -5.905361848054571),
+                                    ("from|since|after <time>December", -6.310826956162734),
+                                    ("<time-of-day> am|pmon <day>", -4.29592393562047),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("yyyy-mm-ddhh:mm:ss", -5.903543665735512),
-                                    ("dayday", -3.8666617384744715),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.309008773843676),
-                                    ("tonightat <time-of-day>", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("yyyy-mm-ddhh:mm:ss", -5.905361848054571),
+                                    ("dayday", -3.86847992079353),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.310826956162734),
+                                    ("tonightat <time-of-day>", -6.310826956162734),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.309008773843676),
-                                    ("today<time-of-day> am|pm", -6.309008773843676),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.903543665735512),
-                                    ("at <time-of-day><time> <part-of-day>", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)intersect", -5.903543665735512),
-                                    ("hourhour", -4.2295672321638405),
-                                    ("Navaratriin|during <named-month>|year", -6.309008773843676),
-                                    ("Wednesdaythis|last|next <cycle>", -6.309008773843676),
-                                    ("Lentyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("today<time-of-day> am|pm", -6.310826956162734),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.905361848054571),
+                                    ("at <time-of-day><time> <part-of-day>", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)intersect", -5.905361848054571),
+                                    ("hourhour", -4.231385414482899),
+                                    ("Navaratriin|during <named-month>|year", -6.310826956162734),
+                                    ("Wednesdaythis|last|next <cycle>", -6.310826956162734),
+                                    ("Lentyear (latent)", -6.310826956162734),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.804931377067402),
-                                    ("Boghiyear (latent)", -6.309008773843676),
-                                    ("dayyear", -1.9269821391697946),
-                                    ("Thursdayfrom|since|after <time>", -5.903543665735512),
+                                     -4.806749559386461),
+                                    ("Boghiyear (latent)", -6.310826956162734),
+                                    ("dayyear", -1.928800321488853),
+                                    ("Thursdayfrom|since|after <time>", -5.905361848054571),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Thursdayat <time-of-day>", -5.61586159328373),
-                                    ("Islamic New Yearyear (latent)", -5.903543665735512),
-                                    ("Laylat al-Qadryear (latent)", -5.392718041969521),
-                                    ("Shrove Tuesdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Thursdayat <time-of-day>", -5.617679775602789),
+                                    ("Islamic New Yearyear (latent)", -5.905361848054571),
+                                    ("Laylat al-Qadryear (latent)", -5.394536224288579),
+                                    ("Shrove Tuesdayyear (latent)", -6.310826956162734),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.61586159328373),
-                                    ("<time-of-day> am|pmtomorrow", -5.61586159328373),
-                                    ("Yom Kippuryear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.903543665735512),
-                                    ("<part-of-day> of <time>year (latent)", -6.309008773843676),
-                                    ("minutehour", -5.210396485175567),
-                                    ("Kaanum Pongalyear (latent)", -5.903543665735512),
-                                    ("Maha Saptamiyear (latent)", -6.309008773843676),
+                                     -5.617679775602789),
+                                    ("<time-of-day> am|pmtomorrow", -5.617679775602789),
+                                    ("Yom Kippuryear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.905361848054571),
+                                    ("<part-of-day> of <time>year (latent)", -6.310826956162734),
+                                    ("minutehour", -5.058063987667366),
+                                    ("Kaanum Pongalyear (latent)", -5.905361848054571),
+                                    ("Maha Saptamiyear (latent)", -6.310826956162734),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.903543665735512),
-                                    ("time-of-day (latent)tomorrow", -5.392718041969521),
-                                    ("part of daysat <time-of-day>", -5.903543665735512),
+                                     -5.905361848054571),
+                                    ("time-of-day (latent)tomorrow", -5.394536224288579),
+                                    ("part of daysat <time-of-day>", -5.905361848054571),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.6042606816052505),
-                                    ("for <duration> from <time>December", -6.309008773843676),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.309008773843676),
+                                     -4.606078863924309),
+                                    ("for <duration> from <time>December", -6.310826956162734),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.310826956162734),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.056245805348308),
-                                    ("time-of-day (latent)this <part-of-day>", -6.309008773843676),
-                                    ("Pentecostyear (latent)", -6.309008773843676),
+                                     -5.058063987667366),
+                                    ("time-of-day (latent)this <part-of-day>", -6.310826956162734),
+                                    ("Pentecostyear (latent)", -6.310826956162734),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.056245805348308),
-                                    ("<day-of-month> (ordinal)February", -6.309008773843676),
-                                    ("Eid al-Fitryear (latent)", -5.392718041969521),
+                                     -5.058063987667366),
+                                    ("<day-of-month> (ordinal)February", -6.310826956162734),
+                                    ("Eid al-Fitryear (latent)", -5.394536224288579),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.309008773843676),
-                                    ("Mondayin|during the <part-of-day>", -6.309008773843676),
-                                    ("Chhathin|during <named-month>|year", -6.309008773843676),
-                                    ("Diwaliin|during <named-month>|year", -6.309008773843676),
-                                    ("Vaisakhiin|during <named-month>|year", -6.309008773843676),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.056245805348308),
-                                    ("Raksha Bandhanyear (latent)", -6.309008773843676),
-                                    ("daysecond", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Mondayin|during the <part-of-day>", -6.310826956162734),
+                                    ("Chhathin|during <named-month>|year", -6.310826956162734),
+                                    ("Diwaliin|during <named-month>|year", -6.310826956162734),
+                                    ("Vaisakhiin|during <named-month>|year", -6.310826956162734),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.058063987667366),
+                                    ("Raksha Bandhanyear (latent)", -6.310826956162734),
+                                    ("daysecond", -5.905361848054571),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.903543665735512),
-                                    ("Ashurayear (latent)", -6.309008773843676),
-                                    ("Tuesdayin|during <named-month>|year", -6.309008773843676),
-                                    ("Chinese New Yearyear (latent)", -6.309008773843676),
-                                    ("tomorrowintersect", -6.309008773843676),
-                                    ("Lag BaOmeryear (latent)", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Ashurayear (latent)", -6.310826956162734),
+                                    ("Tuesdayin|during <named-month>|year", -6.310826956162734),
+                                    ("Chinese New Yearyear (latent)", -6.310826956162734),
+                                    ("tomorrowintersect", -6.310826956162734),
+                                    ("Lag BaOmeryear (latent)", -6.310826956162734),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Eid al-Adhayear (latent)", -4.168942610347405),
-                                    ("intersectin|during the <part-of-day>", -6.309008773843676),
-                                    ("Palm Sundayyear (latent)", -6.309008773843676),
-                                    ("Christmasat <time-of-day>", -6.309008773843676),
-                                    ("Passoveryear (latent)", -6.309008773843676),
-                                    ("Lazarus Saturdayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Eid al-Adhayear (latent)", -4.170760792666464),
+                                    ("intersectin|during the <part-of-day>", -6.310826956162734),
+                                    ("Palm Sundayyear (latent)", -6.310826956162734),
+                                    ("Christmasat <time-of-day>", -6.310826956162734),
+                                    ("Passoveryear (latent)", -6.310826956162734),
+                                    ("Lazarus Saturdayyear (latent)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.309008773843676),
-                                    ("Yom HaShoahyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Yom HaShoahyear (latent)", -5.905361848054571),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Septemberyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Septemberyear (latent)", -5.905361848054571),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.804931377067402),
-                                    ("Halloweenyear (latent)", -6.309008773843676),
+                                     -4.806749559386461),
+                                    ("Halloweenyear (latent)", -6.310826956162734),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.61586159328373),
+                                     -5.617679775602789),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.309008773843676),
-                                    ("at <time-of-day>intersect", -5.903543665735512),
-                                    ("Rosh Hashanahyear (latent)", -5.61586159328373),
-                                    ("Dhanterasyear (latent)", -6.309008773843676),
-                                    ("Tu BiShvatyear (latent)", -6.309008773843676),
-                                    ("<day-of-month> (ordinal)December", -5.61586159328373),
-                                    ("Holiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("at <time-of-day>intersect", -5.905361848054571),
+                                    ("Rosh Hashanahyear (latent)", -5.617679775602789),
+                                    ("Dhanterasyear (latent)", -6.310826956162734),
+                                    ("Tu BiShvatyear (latent)", -6.310826956162734),
+                                    ("<day-of-month> (ordinal)December", -5.617679775602789),
+                                    ("Holiyear (latent)", -5.617679775602789),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Holika Dahanyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Holika Dahanyear (latent)", -5.617679775602789),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.309008773843676),
-                                    ("dayminute", -3.4468078929142076),
-                                    ("Mawlidyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("dayminute", -3.4486260752332663),
+                                    ("Mawlidyear (latent)", -6.310826956162734),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -5.903543665735512),
+                                     -5.905361848054571),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.309008773843676),
-                                    ("Jumu'atul-Widayear (latent)", -5.392718041969521),
-                                    ("minuteday", -2.480367377354581),
+                                     -6.310826956162734),
+                                    ("Jumu'atul-Widayear (latent)", -5.394536224288579),
+                                    ("minuteday", -2.4821855596736397),
                                     ("absorption of , after named dayintersect",
-                                     -6.309008773843676),
-                                    ("intersectyear (latent)", -6.309008773843676),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("intersectyear (latent)", -6.310826956162734),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.310826956162734),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Boss's Dayyear (latent)", -5.903543665735512),
-                                    ("Global Youth Service Dayyear (latent)", -6.309008773843676),
-                                    ("Dhanterasin|during <named-month>|year", -6.309008773843676),
-                                    ("Tisha B'Avyear (latent)", -6.309008773843676),
-                                    ("Isra and Mi'rajyear (latent)", -5.392718041969521),
-                                    ("at <time-of-day>on <day>", -5.210396485175567),
+                                     -6.310826956162734),
+                                    ("Boss's Dayyear (latent)", -5.905361848054571),
+                                    ("Global Youth Service Dayyear (latent)", -6.310826956162734),
+                                    ("Dhanterasin|during <named-month>|year", -6.310826956162734),
+                                    ("Tisha B'Avyear (latent)", -6.310826956162734),
+                                    ("Isra and Mi'rajyear (latent)", -5.394536224288579),
+                                    ("at <time-of-day>on <day>", -5.212214667494625),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.309008773843676),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.61586159328373),
-                                    ("Christmasyear (latent)", -5.903543665735512),
-                                    ("Naraka Chaturdashiyear (latent)", -5.903543665735512),
-                                    ("Thai Pongalin|during <named-month>|year", -6.309008773843676),
-                                    ("dayweek", -6.309008773843676),
-                                    ("Easter Sundayyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.617679775602789),
+                                    ("Christmasyear (latent)", -5.905361848054571),
+                                    ("Naraka Chaturdashiyear (latent)", -5.905361848054571),
+                                    ("Thai Pongalin|during <named-month>|year", -6.310826956162734),
+                                    ("dayweek", -6.310826956162734),
+                                    ("Easter Sundayyear (latent)", -5.617679775602789),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -4.699570861409576),
-                                    ("weekyear", -5.210396485175567),
-                                    ("King's Dayyear (latent)", -4.804931377067402),
-                                    ("hh:mmin|during the <part-of-day>", -5.61586159328373),
+                                     -4.701389043728634),
+                                    ("weekyear", -5.212214667494625),
+                                    ("King's Dayyear (latent)", -4.806749559386461),
+                                    ("hh:mmin|during the <part-of-day>", -5.394536224288579),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.903543665735512),
-                                    ("Hanukkahyear (latent)", -5.61586159328373),
-                                    ("February<time> <part-of-day>", -6.309008773843676),
+                                     -5.905361848054571),
+                                    ("Hanukkahyear (latent)", -5.617679775602789),
+                                    ("February<time> <part-of-day>", -6.310826956162734),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Great Lentyear (latent)", -6.309008773843676),
-                                    ("tomorrowat <time-of-day>", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Great Lentyear (latent)", -6.310826956162734),
+                                    ("tomorrowat <time-of-day>", -5.617679775602789),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("Vaisakhiyear (latent)", -5.61586159328373),
+                                     -6.310826956162734),
+                                    ("Vaisakhiyear (latent)", -5.617679775602789),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.309008773843676),
-                                    ("last <cycle> of <time>year (latent)", -5.61586159328373),
-                                    ("at <time-of-day>tomorrow", -5.903543665735512),
-                                    ("tomorrow<time-of-day> am|pm", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("last <cycle> of <time>year (latent)", -5.617679775602789),
+                                    ("at <time-of-day>tomorrow", -5.905361848054571),
+                                    ("tomorrow<time-of-day> am|pm", -6.310826956162734),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.309008773843676),
-                                    ("Diwaliyear (latent)", -6.309008773843676),
-                                    ("between <time> and <time>on <day>", -4.699570861409576),
-                                    ("Black Fridayyear (latent)", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("Diwaliyear (latent)", -6.310826956162734),
+                                    ("between <time> and <time>on <day>", -4.701389043728634),
+                                    ("Black Fridayyear (latent)", -5.905361848054571),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.309008773843676),
+                                     -6.310826956162734),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.309008773843676),
-                                    ("Chhathyear (latent)", -5.903543665735512),
-                                    ("Vasant Panchamiyear (latent)", -6.309008773843676),
-                                    ("Rabindra Jayantiyear (latent)", -5.056245805348308),
-                                    ("St Patrick's Dayyear (latent)", -6.309008773843676),
-                                    ("Thursday<time> (timezone)", -6.309008773843676),
+                                     -6.310826956162734),
+                                    ("Chhathyear (latent)", -5.905361848054571),
+                                    ("Vasant Panchamiyear (latent)", -6.310826956162734),
+                                    ("Rabindra Jayantiyear (latent)", -5.058063987667366),
+                                    ("St Patrick's Dayyear (latent)", -6.310826956162734),
+                                    ("Thursday<time> (timezone)", -6.310826956162734),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.309008773843676),
-                                    ("<datetime> - <datetime> (interval)July", -5.903543665735512),
+                                     -6.310826956162734),
+                                    ("<datetime> - <datetime> (interval)July", -5.905361848054571),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.903543665735512),
-                                    ("Februaryintersect", -6.309008773843676),
-                                    ("Simchat Torahyear (latent)", -6.309008773843676),
-                                    ("minuteyear", -6.309008773843676)],
-                               n = 419},
+                                     -5.905361848054571),
+                                    ("Februaryintersect", -6.310826956162734),
+                                    ("Simchat Torahyear (latent)", -6.310826956162734),
+                                    ("minuteyear", -6.310826956162734)],
+                               n = 420},
                    koData =
-                     ClassData{prior = -0.9368193120152838, unseen = -6.687108607866515,
+                     ClassData{prior = -0.936021002887969, unseen = -6.6895992691789665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1023420086122493),
+                                   [("hourday", -3.1048357754906517),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)August", -5.992713766508414),
-                                    ("dayhour", -3.427764409046877),
-                                    ("<time> timezoneyear (latent)", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)August", -5.995207533386816),
+                                    ("dayhour", -3.4302581759252795),
+                                    ("<time> timezoneyear (latent)", -5.995207533386816),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.076423034634259),
-                                    ("Tuesdayfrom|since|after <time>", -5.299566585948469),
-                                    ("daymonth", -3.5078071167204135),
-                                    ("monthyear", -4.739950798013046),
-                                    ("<time-of-day> am|pmyear (latent)", -5.299566585948469),
-                                    ("Thai Pongalyear (latent)", -5.299566585948469),
-                                    ("intersecthh:mm", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Tuesdayfrom|since|after <time>", -5.302060352826871),
+                                    ("daymonth", -3.510300883598816),
+                                    ("monthyear", -4.742444564891448),
+                                    ("<time-of-day> am|pmyear (latent)", -5.302060352826871),
+                                    ("Thai Pongalyear (latent)", -5.302060352826871),
+                                    ("intersecthh:mm", -5.995207533386816),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.58724865840025),
-                                    ("<day-of-month> (ordinal)Wednesday", -5.992713766508414),
-                                    ("houryear", -4.6064194053885235),
+                                     -5.589742425278652),
+                                    ("<day-of-month> (ordinal)Wednesday", -5.995207533386816),
+                                    ("houryear", -4.608913172266925),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)October", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)October", -5.995207533386816),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.299566585948469),
-                                    ("hournograin", -4.739950798013046),
-                                    ("<time-of-day> am|pmintersect", -4.739950798013046),
-                                    ("Octoberyear (latent)", -5.992713766508414),
+                                     -5.302060352826871),
+                                    ("hournograin", -4.742444564891448),
+                                    ("<time-of-day> am|pmintersect", -4.742444564891448),
+                                    ("Octoberyear (latent)", -5.995207533386816),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("until <time>on <day>", -5.299566585948469),
-                                    ("time-of-day (latent)intersect", -5.299566585948469),
-                                    ("todayin <number> (implicit minutes)", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("until <time>on <day>", -5.302060352826871),
+                                    ("time-of-day (latent)intersect", -5.302060352826871),
+                                    ("todayin <number> (implicit minutes)", -5.995207533386816),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.299566585948469),
+                                     -5.302060352826871),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.992713766508414),
-                                    ("hh:mmon <day>", -3.5503667311392095),
-                                    ("absorption of , after named dayJuly", -5.58724865840025),
-                                    ("from|since|after <time>July", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("hh:mmon <day>", -3.552860498017612),
+                                    ("absorption of , after named dayJuly", -5.589742425278652),
+                                    ("from|since|after <time>July", -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.076423034634259),
-                                    ("Clean Mondayyear (latent)", -5.992713766508414),
-                                    ("monthhour", -5.992713766508414),
+                                     -5.078916801512661),
+                                    ("Clean Mondayyear (latent)", -5.995207533386816),
+                                    ("monthhour", -5.995207533386816),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.58724865840025),
-                                    ("hourmonth", -4.1209115896068225),
-                                    ("todayat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>December", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("hourmonth", -4.123405356485225),
+                                    ("todayat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>December", -5.995207533386816),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.992713766508414),
-                                    ("<time-of-day> am|pmon <day>", -4.739950798013046),
-                                    ("Mondayyear (latent)", -5.299566585948469),
-                                    ("dayday", -4.6064194053885235),
-                                    ("on <day>September", -5.58724865840025),
-                                    ("time-of-day (latent)September", -5.58724865840025),
-                                    ("hourhour", -5.992713766508414),
-                                    ("time-of-day (latent)on <day>", -3.5503667311392095),
+                                     -5.995207533386816),
+                                    ("<time-of-day> am|pmon <day>", -4.742444564891448),
+                                    ("Mondayyear (latent)", -5.302060352826871),
+                                    ("dayday", -4.608913172266925),
+                                    ("on <day>September", -5.589742425278652),
+                                    ("time-of-day (latent)September", -5.589742425278652),
+                                    ("hourhour", -5.589742425278652),
+                                    ("time-of-day (latent)on <day>", -3.552860498017612),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.58724865840025),
-                                    ("dayyear", -3.074943034424135),
-                                    ("Thursdaymm/dd", -5.992713766508414),
-                                    ("New Year's Dayyear (latent)", -5.076423034634259),
-                                    ("time-of-day (latent)Sunday", -5.58724865840025),
-                                    ("Thursdayfrom|since|after <time>", -4.287965674269989),
-                                    ("Thursdayat <time-of-day>", -4.383275854074314),
+                                     -5.589742425278652),
+                                    ("dayyear", -3.0774368013025373),
+                                    ("Thursdaymm/dd", -5.995207533386816),
+                                    ("New Year's Dayyear (latent)", -5.078916801512661),
+                                    ("time-of-day (latent)Sunday", -5.589742425278652),
+                                    ("Thursdayfrom|since|after <time>", -4.290459441148391),
+                                    ("Thursdayat <time-of-day>", -4.385769620952716),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.992713766508414),
-                                    ("Aprilyear (latent)", -5.992713766508414),
-                                    ("the <day-of-month> (ordinal)July", -5.992713766508414),
-                                    ("the <day-of-month> (number)July", -5.992713766508414),
-                                    ("monthminute", -5.992713766508414),
-                                    ("<time-of-day> am|pmtomorrow", -5.992713766508414),
-                                    ("Thursdayhh:mm", -5.076423034634259),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.58724865840025),
-                                    ("minutemonth", -4.1209115896068225),
-                                    ("time-of-day (latent)Friday", -5.58724865840025),
-                                    ("minutehour", -5.992713766508414),
-                                    ("Augustyear (latent)", -5.58724865840025),
-                                    ("week-endin|during <named-month>|year", -5.992713766508414),
-                                    ("time-of-day (latent)Tuesday", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("Aprilyear (latent)", -5.995207533386816),
+                                    ("the <day-of-month> (ordinal)July", -5.995207533386816),
+                                    ("the <day-of-month> (number)July", -5.995207533386816),
+                                    ("monthminute", -5.995207533386816),
+                                    ("<time-of-day> am|pmtomorrow", -5.995207533386816),
+                                    ("Thursdayhh:mm", -5.078916801512661),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.589742425278652),
+                                    ("minutemonth", -4.123405356485225),
+                                    ("time-of-day (latent)Friday", -5.589742425278652),
+                                    ("minutehour", -5.995207533386816),
+                                    ("Augustyear (latent)", -5.589742425278652),
+                                    ("week-endin|during <named-month>|year", -5.995207533386816),
+                                    ("time-of-day (latent)Tuesday", -5.589742425278652),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
-                                    ("Sundayyear (latent)", -5.076423034634259),
-                                    ("Christmasat <time-of-day>", -5.992713766508414),
-                                    ("from|since|after <time>year (latent)", -4.894101477840304),
-                                    ("<duration> after|before|from <time>December",
-                                     -5.992713766508414),
-                                    ("yesterday<time-of-day> am|pm", -5.992713766508414),
-                                    ("<day-of-month> (ordinal)July", -5.299566585948469),
+                                     -5.995207533386816),
+                                    ("Sundayyear (latent)", -5.078916801512661),
+                                    ("Christmasat <time-of-day>", -5.995207533386816),
+                                    ("from|since|after <time>year (latent)", -4.896595244718706),
+                                    ("yesterday<time-of-day> am|pm", -5.995207533386816),
+                                    ("<day-of-month> (ordinal)July", -5.302060352826871),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.992713766508414),
+                                     -5.995207533386816),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.992713766508414),
-                                    ("at <time-of-day>intersect", -5.58724865840025),
-                                    ("hh:mmyear (latent)", -3.913272224828578),
-                                    ("Holiyear (latent)", -5.992713766508414),
-                                    ("until <time><time-of-day> am|pm", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("at <time-of-day>intersect", -5.589742425278652),
+                                    ("hh:mmyear (latent)", -3.9157659917069805),
+                                    ("Holiyear (latent)", -5.995207533386816),
+                                    ("until <time><time-of-day> am|pm", -5.995207533386816),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.992713766508414),
-                                    ("dayminute", -3.427764409046877),
-                                    ("yyyy-mm-ddhh:mm", -5.58724865840025),
-                                    ("intersectfrom|since|after <time>", -5.58724865840025),
-                                    ("intersectSeptember", -4.48863636973214),
-                                    ("minuteday", -2.7540353143440335),
+                                     -5.995207533386816),
+                                    ("dayminute", -3.4302581759252795),
+                                    ("yyyy-mm-ddhh:mm", -5.589742425278652),
+                                    ("intersectfrom|since|after <time>", -5.589742425278652),
+                                    ("intersectSeptember", -4.4911301366105425),
+                                    ("minuteday", -2.756529081222436),
                                     ("absorption of , after named dayintersect",
-                                     -5.992713766508414),
-                                    ("intersectyear (latent)", -5.992713766508414),
-                                    ("Februaryin|during the <part-of-day>", -5.992713766508414),
-                                    ("time-of-day (latent)July", -5.299566585948469),
-                                    ("Saturdayyear (latent)", -5.992713766508414),
-                                    ("at <time-of-day>on <day>", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("intersectyear (latent)", -5.995207533386816),
+                                    ("Februaryin|during the <part-of-day>", -5.995207533386816),
+                                    ("<duration> after|before|from|past <time>December",
+                                     -5.995207533386816),
+                                    ("time-of-day (latent)July", -5.302060352826871),
+                                    ("Saturdayyear (latent)", -5.995207533386816),
+                                    ("at <time-of-day>on <day>", -5.589742425278652),
                                     ("absorption of , after named daySeptember",
-                                     -5.076423034634259),
-                                    ("Naraka Chaturdashiyear (latent)", -5.992713766508414),
-                                    ("from|since|after <time>on <day>", -5.076423034634259),
-                                    ("dayweek", -5.992713766508414),
-                                    ("Easter Sundayyear (latent)", -5.58724865840025),
-                                    ("Thursday<time-of-day> am|pm", -4.739950798013046),
-                                    ("weekyear", -5.58724865840025),
-                                    ("time-of-day (latent)Thursday", -5.58724865840025),
+                                     -5.078916801512661),
+                                    ("Naraka Chaturdashiyear (latent)", -5.995207533386816),
+                                    ("from|since|after <time>on <day>", -5.078916801512661),
+                                    ("dayweek", -5.995207533386816),
+                                    ("Easter Sundayyear (latent)", -5.589742425278652),
+                                    ("Thursday<time-of-day> am|pm", -4.742444564891448),
+                                    ("weekyear", -5.589742425278652),
+                                    ("time-of-day (latent)Thursday", -5.589742425278652),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.992713766508414),
-                                    ("<day-of-month> (ordinal)April", -5.992713766508414),
+                                     -5.995207533386816),
+                                    ("<day-of-month> (ordinal)April", -5.995207533386816),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.58724865840025),
+                                     -5.589742425278652),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.299566585948469),
-                                    ("Sundayfrom|since|after <time>", -5.992713766508414),
-                                    ("absorption of , after named dayFebruary", -5.076423034634259),
+                                     -5.302060352826871),
+                                    ("Sundayfrom|since|after <time>", -5.995207533386816),
+                                    ("absorption of , after named dayFebruary", -5.078916801512661),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.992713766508414),
+                                     -5.589742425278652),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.992713766508414),
-                                    ("tomorrowat <time-of-day>", -5.992713766508414),
-                                    ("daynograin", -5.58724865840025),
+                                     -5.995207533386816),
+                                    ("tomorrowat <time-of-day>", -5.995207533386816),
+                                    ("daynograin", -5.589742425278652),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.58724865840025),
-                                    ("last <cycle> of <time>year (latent)", -5.58724865840025),
-                                    ("tomorrow<time-of-day> am|pm", -5.992713766508414),
+                                     -5.589742425278652),
+                                    ("last <cycle> of <time>year (latent)", -5.589742425278652),
+                                    ("tomorrow<time-of-day> am|pm", -5.995207533386816),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.299566585948469),
-                                    ("Diwaliyear (latent)", -5.58724865840025),
+                                     -5.302060352826871),
+                                    ("Diwaliyear (latent)", -5.589742425278652),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.992713766508414),
-                                    ("Fridayyear (latent)", -5.58724865840025),
-                                    ("time-of-day (latent)April", -5.992713766508414),
-                                    ("minuteyear", -3.7954891891721947)],
-                               n = 270}}),
+                                     -5.995207533386816),
+                                    ("Fridayyear (latent)", -5.589742425278652),
+                                    ("time-of-day (latent)April", -5.995207533386816),
+                                    ("minuteyear", -3.797982956050597)],
+                               n = 271}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1600,19 +1601,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
-                                    ("hour", -0.8938178760220964),
-                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
-                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
-                               n = 8},
+                                   [("at <time-of-day>integer (20..90)", -2.5649493574615367),
+                                    ("time-of-day (latent)integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer 21..99", -2.159484249353372),
+                                    ("hour", -0.8602012652231115),
+                                    ("at <time-of-day>integer (numeric)", -2.159484249353372),
+                                    ("time-of-day (latent)integer (20..90)", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -1871,16 +1872,16 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("in|during the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.701137698962981e-2,
-                               unseen = -3.258096538021482,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("early morning", -2.5257286443082556),
-                                    ("hour", -0.7339691750802004),
-                                    ("part of days", -0.8209805520698302)],
-                               n = 11},
+                                   [("early morning", -2.6026896854443837),
+                                    ("hour", -0.7308875085427924),
+                                    ("part of days", -0.8109302162163288)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -2.4849066497880004, unseen = -1.791759469228055,
+                     ClassData{prior = -2.5649493574615367, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
                                    [("hour", -0.916290731874155),
@@ -2096,8 +2097,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.9444389791664407,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 17},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2127,19 +2128,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.8347976976229721, unseen = -4.553876891600541,
+                     ClassData{prior = -0.7975071958841881, unseen = -4.634728988229636,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.13657553500575073),
-                                    ("integer (0..19)", -2.0583881324820035)],
-                               n = 92},
+                                   [("integer (numeric)", -0.12516314295400605),
+                                    ("integer (0..19)", -2.1400661634962708)],
+                               n = 100},
                    koData =
-                     ClassData{prior = -0.5690945318899665, unseen = -4.812184355372417,
+                     ClassData{prior = -0.5986563371390228,
+                               unseen = -4.8283137373023015,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -6.782259633876106e-2),
-                                    ("integer (0..19)", -2.7245795030534206)],
-                               n = 120}}),
+                                   [("integer (numeric)", -6.669137449867228e-2),
+                                    ("integer (0..19)", -2.740840023925201)],
+                               n = 122}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2162,33 +2164,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.11641035184441134,
-                               unseen = -5.220355825078324,
+                     ClassData{prior = -0.11000089521432846,
+                               unseen = -5.272999558563747,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.575878427993727),
-                                    ("integer (0..19)year (grain)", -3.1354942159291497),
-                                    ("integer (numeric)day (grain)", -2.575878427993727),
-                                    ("integer (0..19)second (grain) ", -3.828641396489095),
-                                    ("integer (0..19)hour (grain)", -3.0177111802727663),
-                                    ("second", -3.4231762883809305),
-                                    ("integer (numeric)second (grain) ", -4.116323468940876),
-                                    ("integer (numeric)year (grain)", -3.2690256085536724),
-                                    ("day", -2.324563999712821), ("year", -2.575878427993727),
-                                    ("integer (numeric)week (grain)", -3.1354942159291497),
-                                    ("integer (0..19)month (grain)", -3.6054978451748854),
-                                    ("integer (20..90)minute (grain)", -4.5217885770490405),
-                                    ("hour", -2.649986400147449), ("month", -3.2690256085536724),
-                                    ("integer (numeric)minute (grain)", -3.1354942159291497),
-                                    ("integer (0..19)minute (grain)", -3.1354942159291497),
-                                    ("integer (numeric)month (grain)", -4.116323468940876),
-                                    ("minute", -2.4423470353692043),
-                                    ("integer (numeric)hour (grain)", -3.6054978451748854),
-                                    ("integer (0..19)day (grain)", -3.6054978451748854),
-                                    ("integer (0..19)week (grain)", -3.2690256085536724)],
-                               n = 81},
+                                   [("week", -2.62880082944807),
+                                    ("integer (0..19)year (grain)", -3.188416617383492),
+                                    ("integer (numeric)day (grain)", -2.62880082944807),
+                                    ("integer (0..19)second (grain) ", -3.8815637979434374),
+                                    ("integer (0..19)hour (grain)", -3.0706335817271087),
+                                    ("second", -3.4760986898352733),
+                                    ("integer (numeric)second (grain) ", -4.169245870395218),
+                                    ("integer (numeric)year (grain)", -3.3219480100080148),
+                                    ("day", -2.3774864011671633), ("year", -2.62880082944807),
+                                    ("integer (numeric)week (grain)", -3.188416617383492),
+                                    ("integer (0..19)month (grain)", -3.6584202466292277),
+                                    ("integer (20..90)minute (grain)", -4.574710978503383),
+                                    ("hour", -2.7029088016017915), ("month", -3.3219480100080148),
+                                    ("integer (numeric)minute (grain)", -2.7029088016017915),
+                                    ("integer (0..19)minute (grain)", -3.188416617383492),
+                                    ("integer (numeric)month (grain)", -4.169245870395218),
+                                    ("minute", -2.223335721339905),
+                                    ("integer (numeric)hour (grain)", -3.6584202466292277),
+                                    ("integer (0..19)day (grain)", -3.6584202466292277),
+                                    ("integer (0..19)week (grain)", -3.3219480100080148)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -2.2082744135228043,
+                     ClassData{prior = -2.2617630984737906,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -2230,39 +2232,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23815634370339492, unseen = -5.54907608489522,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.631211781821365,
                                likelihoods =
                                  HashMap.fromList
-                                   [("from|since|after <time>", -3.5992672954242493),
-                                    ("integer after|past <hour-of-day>", -4.1588830833596715),
-                                    ("at <time-of-day>", -2.3263016196113617),
-                                    ("<time-of-day> o'clock", -4.446565155811453),
-                                    ("half after|past <hour-of-day>", -4.446565155811453),
-                                    ("second", -4.852030263919617),
-                                    ("hh:mm:ss", -4.852030263919617),
-                                    ("<hour-of-day> <integer>", -3.9357395320454622),
-                                    ("time-of-day (latent)", -1.6533571463689358),
-                                    ("hhmm (latent)", -4.852030263919617),
-                                    ("hh:mm", -2.4096832285504126),
-                                    ("quarter after|past <hour-of-day>", -4.852030263919617),
-                                    ("until <time>", -4.1588830833596715),
-                                    ("about|exactly <time-of-day>", -4.852030263919617),
-                                    ("hour", -1.1884686177899708),
-                                    ("<time-of-day> sharp|exactly", -4.852030263919617),
-                                    ("minute", -1.807507826196194)],
-                               n = 119},
+                                   [("from|since|after <time>", -3.681710964635324),
+                                    ("integer after|past <hour-of-day>", -4.241326752570746),
+                                    ("at <time-of-day>", -2.4087452888224363),
+                                    ("<time-of-day> o'clock", -4.529008825022527),
+                                    ("half after|past <hour-of-day>", -4.529008825022527),
+                                    ("second", -4.9344739331306915),
+                                    ("hh:mm:ss", -4.9344739331306915),
+                                    ("<hour-of-day> <integer>", -4.018183201256536),
+                                    ("time-of-day (latent)", -1.6573292001385151),
+                                    ("hhmm (latent)", -4.9344739331306915),
+                                    ("hh:mm", -2.3317842476863078),
+                                    ("quarter after|past <hour-of-day>", -4.018183201256536),
+                                    ("until <time>", -4.241326752570746),
+                                    ("about|exactly <time-of-day>", -4.9344739331306915),
+                                    ("hour", -1.220901866426384),
+                                    ("<time-of-day> sharp|exactly", -4.9344739331306915),
+                                    ("minute", -1.7358008155800104)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.5515439340151977, unseen = -4.418840607796598,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.0204248861443626),
-                                    ("from|since|after <time>", -3.3081069585961433),
-                                    ("at <time-of-day>", -3.3081069585961433),
-                                    ("time-of-day (latent)", -1.2712250313351032),
-                                    ("hh:mm", -3.3081069585961433),
-                                    ("until <time>", -3.713572066704308),
-                                    ("hour", -1.110882381259924), ("minute", -2.46080909820894)],
-                               n = 32}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.1135153092103742),
+                                    ("from|since|after <time>", -3.1135153092103742),
+                                    ("at <time-of-day>", -3.4011973816621555),
+                                    ("time-of-day (latent)", -1.241713132308783),
+                                    ("hh:mm", -3.4011973816621555),
+                                    ("until <time>", -3.8066624897703196),
+                                    ("hour", -1.0658224658451187), ("minute", -2.5538995212749516)],
+                               n = 36}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2328,7 +2331,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.5306282510621704,
+                     ClassData{prior = -0.7419373447293773,
                                unseen = -3.5553480614894135,
                                likelihoods =
                                  HashMap.fromList
@@ -2344,13 +2347,14 @@ classifiers
                                     ("day (grain)", -2.1400661634962708)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.8873031950009028, unseen = -3.367295829986474,
+                     ClassData{prior = -0.6466271649250525,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hour (grain)", -1.7227665977411035),
-                                    ("quarter", -1.9459101490553135), ("hour", -1.7227665977411035),
-                                    ("quarter (grain)", -1.9459101490553135)],
-                               n = 7}}),
+                                   [("hour (grain)", -1.9740810260220096),
+                                    ("quarter", -1.5040773967762742), ("hour", -1.9740810260220096),
+                                    ("quarter (grain)", -1.5040773967762742)],
+                               n = 11}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -2385,11 +2389,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -9.237332013101517e-2,
-                               unseen = -4.553876891600541,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                     ClassData{prior = -8.701137698962981e-2,
+                               unseen = -4.61512051684126,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 99},
                    koData =
-                     ClassData{prior = -2.4277482359480516,
+                     ClassData{prior = -2.4849066497880004,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
@@ -2463,16 +2467,64 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("quarter after|past <hour-of-day>",
+       ("<duration> after|before|from|past <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.5679840376059393, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1},
+                                   [("a <unit-of-duration>now", -3.3843902633457743),
+                                    ("a <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("dayday", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>today", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -2.468099531471619),
+                                    ("minutehour", -1.7749523509116738),
+                                    ("daysecond", -3.3843902633457743),
+                                    ("a <unit-of-duration>right now", -3.3843902633457743),
+                                    ("minutenograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Christmas", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>Easter Sunday",
+                                     -3.3843902633457743),
+                                    ("secondnograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration><time-of-day> am|pm",
+                                     -2.468099531471619),
+                                    ("yearday", -2.691243082785829),
+                                    ("<integer> <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.3843902633457743),
+                                    ("daynograin", -3.3843902633457743),
+                                    ("<integer> <unit-of-duration>now", -2.9789251552376097)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.8362480242006186, unseen = -3.951243718581427,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarterhour", -1.62924053973028),
+                                    ("dayhour", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration>intersect", -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration><time-of-day> am|pm", -2.322387720290225),
+                                    ("a <unit-of-duration>time-of-day (latent)",
+                                     -2.322387720290225),
+                                    ("dayday", -2.5455312716044354),
+                                    ("<integer> <unit-of-duration>time-of-day (latent)",
+                                     -3.2386784521643803),
+                                    ("a <unit-of-duration>noon|midnight|EOD|end of day",
+                                     -3.2386784521643803),
+                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
+                                     -3.2386784521643803)],
+                               n = 13}}),
+       ("quarter after|past <hour-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("noon|midnight|EOD|end of day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -0.9555114450274363),
+                                    ("hour", -0.7731898882334817)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yyyy-mm",
         Classifier{okData =
@@ -2803,41 +2855,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<duration> after|before|from <time>",
-        Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.5553480614894135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("a <unit-of-duration>now", -2.833213344056216),
-                                    ("a <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("dayday", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>today", -2.833213344056216),
-                                    ("daysecond", -2.833213344056216),
-                                    ("a <unit-of-duration>right now", -2.833213344056216),
-                                    ("minutenograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Christmas", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>Easter Sunday",
-                                     -2.833213344056216),
-                                    ("secondnograin", -2.833213344056216),
-                                    ("yearday", -2.1400661634962708),
-                                    ("daynograin", -2.833213344056216),
-                                    ("<integer> <unit-of-duration>now", -2.4277482359480516)],
-                               n = 8},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("dayhour", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration>intersect", -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal)",
-                                     -2.5649493574615367),
-                                    ("dayday", -1.8718021769015913),
-                                    ("<integer> <unit-of-duration>time-of-day (latent)",
-                                     -2.5649493574615367),
-                                    ("<integer> <unit-of-duration><day-of-month> (ordinal or number) <named-month>",
-                                     -2.5649493574615367)],
-                               n = 4}}),
        ("<day-of-month> (ordinal or number) of <month>",
         Classifier{okData =
                      ClassData{prior = -0.7339691750802004,
@@ -3295,12 +3312,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.4595323293784402, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
@@ -3532,11 +3549,11 @@ classifiers
                                n = 1}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -6.453852113757118e-2,
-                               unseen = -3.4657359027997265,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
+                     ClassData{prior = -6.252035698133393e-2,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
                    koData =
-                     ClassData{prior = -2.772588722239781, unseen = -1.3862943611198906,
+                     ClassData{prior = -2.803360380906535, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("at the beginning|end of <week>",
         Classifier{okData =
diff --git a/Duckling/Time/EN/Corpus.hs b/Duckling/Time/EN/Corpus.hs
index 3f010d50..e5f74e25 100644
--- a/Duckling/Time/EN/Corpus.hs
+++ b/Duckling/Time/EN/Corpus.hs
@@ -510,6 +510,7 @@ allExamples = concat
              , "3:15PM"
              , "3:15p"
              , "at 3 15"
+             , "15 minutes past 3pm"
              ]
   , examples (datetime (2013, 2, 12, 15, 20, 0) Minute)
              [ "at 20 past 3pm"
@@ -518,6 +519,7 @@ allExamples = concat
              , "twenty after 3pm"
              , "3:20p"
              , "at three twenty"
+             , "20 minutes past 3pm"
              ]
   , examples (datetime (2013, 2, 12, 15, 30, 0) Minute)
              [ "at half past three pm"
@@ -529,7 +531,19 @@ allExamples = concat
              , "3:30 p m"
              , "3:30"
              , "half three"
+             , "30 minutes past 3 pm"
              ]
+   , examples (datetime (2013, 2, 12, 12, 15, 0) Minute)
+              [ "at 15 past noon"
+              , "a quarter past noon"
+              , "12:15 in the afternoon"
+              , "12:15"
+              , "12:15pm"
+              , "12:15PM"
+              , "12:15p"
+              , "at 12 15"
+              , "15 minutes past noon"
+  ]
   , examples (datetime (2013, 2, 12, 9, 59, 0) Minute)
              [ "nine fifty nine a m"
              ]
@@ -541,6 +555,17 @@ allExamples = concat
              , "11:45am"
              , "15 to noon"
              ]
+  , examples (datetime (2013, 2, 12, 13, 15, 0) Minute)
+             [ "a quarter past 1pm"
+             , "1:15pm"
+             , "15 minutes from 1pm"
+             ]
+  , examples (datetime (2013, 2, 12, 14, 15, 0) Minute)
+             [ "a quarter past 2pm"
+             ]
+  , examples (datetime (2013, 2, 12, 20, 15, 0) Minute)
+             [ "a quarter past 8pm"
+             ]
   , examples (datetime (2013, 2, 12, 20, 0, 0) Hour)
              [ "8 tonight"
              , "eight tonight"
diff --git a/Duckling/Time/EN/Rules.hs b/Duckling/Time/EN/Rules.hs
index 622d2d12..eeccde0c 100644
--- a/Duckling/Time/EN/Rules.hs
+++ b/Duckling/Time/EN/Rules.hs
@@ -2274,10 +2274,10 @@ ruleInNumeral = Rule
 
 ruleDurationAfterBeforeTime :: Rule
 ruleDurationAfterBeforeTime = Rule
-  { name = "<duration> after|before|from <time>"
+  { name = "<duration> after|before|from|past <time>"
   , pattern =
     [ dimension Duration
-    , regex "(after|before|from)"
+    , regex "(after|before|from|past)"
     , dimension Time
     ]
   , prod = \tokens -> case tokens of