diff --git a/Duckling/Ranking/Classifiers/EN_AU.hs b/Duckling/Ranking/Classifiers/EN_AU.hs
index c8cb8a22..fada53c3 100644
--- a/Duckling/Ranking/Classifiers/EN_AU.hs
+++ b/Duckling/Ranking/Classifiers/EN_AU.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
-                                    ("Thursdaydd/mm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
+                                    ("Thursdaydd/mm", -6.0787883752796565),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1701,10 +1718,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_BZ.hs b/Duckling/Ranking/Classifiers/EN_BZ.hs
index d6acdb51..a9134595 100644
--- a/Duckling/Ranking/Classifiers/EN_BZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_BZ.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
-                                    ("Thursdaydd/mm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
+                                    ("Thursdaydd/mm", -6.0787883752796565),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1701,10 +1718,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_CA.hs b/Duckling/Ranking/Classifiers/EN_CA.hs
index 2e584c40..9a5f119f 100644
--- a/Duckling/Ranking/Classifiers/EN_CA.hs
+++ b/Duckling/Ranking/Classifiers/EN_CA.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5808179955860256, unseen = -6.1779441140506,
+                     ClassData{prior = -0.5667332557042866, unseen = -6.1779441140506,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 480},
                    koData =
-                     ClassData{prior = -0.8197099038683746, unseen = -5.940171252720432,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 378}}),
+                     ClassData{prior = -0.837886026204857, unseen = -5.908082938168931,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 366}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -619,28 +620,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -679,11 +680,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -859,6 +861,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -947,460 +961,467 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4481315544270673, unseen = -7.20414929203594,
+                     ClassData{prior = -0.4535756516033265, unseen = -7.19668657083435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.51025834052315),
-                                    ("Father's Dayyear (latent)", -6.51025834052315),
-                                    ("Karva Chauthyear (latent)", -6.51025834052315),
+                                   [("Navaratriyear (latent)", -6.502790045915623),
+                                    ("Father's Dayyear (latent)", -6.502790045915623),
+                                    ("Karva Chauthyear (latent)", -6.502790045915623),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.51025834052315),
-                                    ("Maha Shivaratriyear (latent)", -6.51025834052315),
-                                    ("Ramadanyear (latent)", -5.2574953720277815),
+                                     -6.502790045915623),
+                                    ("Maha Shivaratriyear (latent)", -6.502790045915623),
+                                    ("Ramadanyear (latent)", -5.250027077420255),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.123963979403259),
-                                    ("Bhai Doojyear (latent)", -6.51025834052315),
-                                    ("hourday", -4.4953553199808844),
-                                    ("dayhour", -3.4657359027997265),
+                                     -5.1164956847957335),
+                                    ("Bhai Doojyear (latent)", -6.502790045915623),
+                                    ("hourday", -4.487887025373359),
+                                    ("dayhour", -3.458267608192201),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.123963979403259),
-                                    ("Martin Luther King's Dayyear (latent)", -6.104793232414985),
-                                    ("Shemini Atzeretyear (latent)", -6.51025834052315),
-                                    ("daymonth", -4.4953553199808844),
-                                    ("monthday", -6.104793232414985),
-                                    ("monthyear", -4.718498871295094),
-                                    ("Yom Ha'atzmautyear (latent)", -6.51025834052315),
-                                    ("Vijayadashamiyear (latent)", -6.51025834052315),
+                                     -5.1164956847957335),
+                                    ("Martin Luther King's Dayyear (latent)", -6.09732493780746),
+                                    ("Shemini Atzeretyear (latent)", -6.502790045915623),
+                                    ("daymonth", -4.487887025373359),
+                                    ("monthday", -6.09732493780746),
+                                    ("monthyear", -4.711030576687569),
+                                    ("Yom Ha'atzmautyear (latent)", -6.502790045915623),
+                                    ("Vijayadashamiyear (latent)", -6.502790045915623),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -6.104793232414985),
-                                    ("Thanksgiving Dayyear (latent)", -5.4116460518550396),
-                                    ("Thai Pongalyear (latent)", -5.817111159963204),
-                                    ("Thiru Onamyear (latent)", -5.817111159963204),
-                                    ("hhhmmabsorption of , after named day", -6.51025834052315),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.51025834052315),
+                                     -6.09732493780746),
+                                    ("Thanksgiving Dayyear (latent)", -5.404177757247514),
+                                    ("Thai Pongalyear (latent)", -5.809642865355679),
+                                    ("Thiru Onamyear (latent)", -5.809642865355679),
+                                    ("hhhmmabsorption of , after named day", -6.502790045915623),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.502790045915623),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.5939676086489944),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.51025834052315),
-                                    ("Krishna Janmashtamiyear (latent)", -6.104793232414985),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.51025834052315),
-                                    ("houryear", -5.5939676086489944),
+                                     -5.586499314041468),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.502790045915623),
+                                    ("Krishna Janmashtamiyear (latent)", -6.09732493780746),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.502790045915623),
+                                    ("houryear", -5.586499314041468),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.51025834052315),
-                                    ("Christmas<time-of-day> am|pm", -6.51025834052315),
+                                     -6.502790045915623),
+                                    ("Christmas<time-of-day> am|pm", -6.502790045915623),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.51025834052315),
+                                     -6.502790045915623),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.817111159963204),
-                                    ("intersectin|during <named-month>|year", -6.51025834052315),
-                                    ("<time-of-day> am|pmintersect", -5.2574953720277815),
-                                    ("Earth Houryear (latent)", -6.51025834052315),
-                                    ("Ganesh Chaturthiyear (latent)", -6.51025834052315),
-                                    ("Family Dayyear (latent)", -5.5939676086489944),
-                                    ("Octoberyear (latent)", -5.006180943746876),
-                                    ("intersect<time-of-day> am|pm", -6.51025834052315),
-                                    ("Mattu Pongalyear (latent)", -6.51025834052315),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.51025834052315),
-                                    ("Shavuotyear (latent)", -6.51025834052315),
-                                    ("Parsi New Yearyear (latent)", -5.5939676086489944),
+                                     -5.809642865355679),
+                                    ("intersectin|during <named-month>|year", -6.502790045915623),
+                                    ("<time-of-day> am|pmintersect", -5.250027077420255),
+                                    ("Earth Houryear (latent)", -6.502790045915623),
+                                    ("Ganesh Chaturthiyear (latent)", -6.502790045915623),
+                                    ("Family Dayyear (latent)", -5.586499314041468),
+                                    ("Octoberyear (latent)", -4.99871264913935),
+                                    ("intersect<time-of-day> am|pm", -6.502790045915623),
+                                    ("Mattu Pongalyear (latent)", -6.502790045915623),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.502790045915623),
+                                    ("Shavuotyear (latent)", -6.502790045915623),
+                                    ("Parsi New Yearyear (latent)", -5.586499314041468),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.51025834052315),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.51025834052315),
-                                    ("todayin|within|after <duration>", -6.51025834052315),
+                                     -6.502790045915623),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.502790045915623),
+                                    ("todayin|within|after <duration>", -6.502790045915623),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.104793232414985),
-                                    ("Marchyear (latent)", -6.51025834052315),
+                                     -6.09732493780746),
+                                    ("Marchyear (latent)", -6.502790045915623),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.104793232414985),
-                                    ("Sukkotyear (latent)", -6.104793232414985),
-                                    ("hhhmmintersect", -6.104793232414985),
+                                     -6.09732493780746),
+                                    ("Sukkotyear (latent)", -6.09732493780746),
+                                    ("hhhmmintersect", -6.09732493780746),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
+                                     -6.09732493780746),
+                                    ("Clean Mondayyear (latent)", -6.09732493780746),
+                                    ("monthhour", -6.09732493780746),
+                                    ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
+                                     -5.809642865355679),
+                                    ("todayat <time-of-day>", -6.502790045915623),
+                                    ("Thursday<time> timezone", -4.104894773117253),
+                                    ("tonight<time-of-day> am|pm", -6.502790045915623),
+                                    ("time-of-day (latent)tonight", -6.09732493780746),
+                                    ("from|since|after <time>December", -6.502790045915623),
+                                    ("<time-of-day> am|pmon <day>", -4.487887025373359),
+                                    ("this <time>hh(:mm) - <time-of-day> am|pm",
+                                     -6.502790045915623),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.09732493780746),
+                                    ("dayday", -3.7947398448134138),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.09732493780746),
+                                    ("mm/ddat <time-of-day>", -6.502790045915623),
+                                    ("tonightat <time-of-day>", -5.809642865355679),
+                                    ("<time-of-day> am|pmabsorption of , after named day",
+                                     -5.809642865355679),
+                                    ("Dayananda Saraswati Jayantiyear (latent)",
+                                     -6.502790045915623),
+                                    ("today<time-of-day> am|pm", -6.502790045915623),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.09732493780746),
+                                    ("at <time-of-day><time> <part-of-day>", -6.502790045915623),
+                                    ("<day-of-month> (ordinal)intersect", -6.09732493780746),
+                                    ("mm/dd<time-of-day> am|pm", -6.502790045915623),
+                                    ("hourhour", -3.612418288019459),
+                                    ("Mahavir Jayantiyear (latent)", -6.09732493780746),
+                                    ("Navaratriin|during <named-month>|year", -6.502790045915623),
+                                    ("National Patriots' Dayyear (latent)", -5.809642865355679),
+                                    ("Wednesdaythis|last|next <cycle>", -6.502790045915623),
+                                    ("Lentyear (latent)", -6.502790045915623),
+                                    ("intersect<named-month> <day-of-month> (non ordinal)",
+                                     -4.6309878690140325),
+                                    ("Boghiyear (latent)", -6.502790045915623),
+                                    ("dayyear", -1.8632184332102),
+                                    ("Karva Chauthin|during <named-month>|year",
+                                     -6.502790045915623),
+                                    ("Thursdayfrom|since|after <time>", -6.09732493780746),
+                                    ("<time-of-day> o'clockin|during the <part-of-day>",
+                                     -6.502790045915623),
+                                    ("Thursdayat <time-of-day>", -5.809642865355679),
+                                    ("Islamic New Yearyear (latent)", -6.09732493780746),
+                                    ("Laylat al-Qadryear (latent)", -5.586499314041468),
+                                    ("part of days<time-of-day> am|pm", -6.502790045915623),
+                                    ("Discovery Dayyear (latent)", -6.09732493780746),
+                                    ("Shrove Tuesdayyear (latent)", -6.502790045915623),
+                                    ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
+                                     -5.809642865355679),
+                                    ("hourminute", -6.09732493780746),
+                                    ("<time-of-day> am|pmtomorrow", -5.809642865355679),
+                                    ("Yom Kippuryear (latent)", -6.502790045915623),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.09732493780746),
+                                    ("<part-of-day> of <time>year (latent)", -6.502790045915623),
+                                    ("minutehour", -5.250027077420255),
+                                    ("Kaanum Pongalyear (latent)", -6.09732493780746),
+                                    ("Maha Saptamiyear (latent)", -6.502790045915623),
+                                    ("at <time-of-day>in|during the <part-of-day>",
+                                     -5.809642865355679),
+                                    ("time-of-day (latent)tomorrow", -5.586499314041468),
+                                    ("part of daysat <time-of-day>", -4.893352133481524),
+                                    ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
+                                     -4.487887025373359),
+                                    ("for <duration> from <time>December", -6.502790045915623),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.502790045915623),
+                                    ("Thursdayfrom <datetime> - <datetime> (interval)",
+                                     -5.250027077420255),
+                                    ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
+                                     -5.250027077420255),
+                                    ("time-of-day (latent)this <part-of-day>", -6.502790045915623),
+                                    ("Pentecostyear (latent)", -6.502790045915623),
+                                    ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
+                                     -5.250027077420255),
+                                    ("<day-of-month> (ordinal)February", -6.502790045915623),
+                                    ("Eid al-Fitryear (latent)", -5.1164956847957335),
+                                    ("Vasant Panchamiin|during <named-month>|year",
+                                     -6.502790045915623),
+                                    ("Mondayin|during the <part-of-day>", -6.502790045915623),
+                                    ("Chhathin|during <named-month>|year", -6.502790045915623),
+                                    ("Diwaliin|during <named-month>|year", -6.502790045915623),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.502790045915623),
+                                    ("Vaisakhiin|during <named-month>|year", -6.502790045915623),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.250027077420255),
+                                    ("Raksha Bandhanyear (latent)", -6.502790045915623),
+                                    ("daysecond", -6.09732493780746),
+                                    ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
+                                     -6.09732493780746),
+                                    ("Ratha-Yatrayear (latent)", -6.502790045915623),
+                                    ("Ashurayear (latent)", -6.502790045915623),
+                                    ("Tuesdayin|during <named-month>|year", -6.502790045915623),
+                                    ("Chinese New Yearyear (latent)", -6.502790045915623),
+                                    ("tomorrowintersect", -6.502790045915623),
+                                    ("Lag BaOmeryear (latent)", -6.502790045915623),
+                                    ("last weekend of <named-month>year (latent)",
+                                     -6.502790045915623),
+                                    ("Eid al-Adhayear (latent)", -4.362723882419353),
+                                    ("intersectin|during the <part-of-day>", -6.502790045915623),
+                                    ("Palm Sundayyear (latent)", -6.502790045915623),
+                                    ("Christmasat <time-of-day>", -6.502790045915623),
+                                    ("Passoveryear (latent)", -6.502790045915623),
+                                    ("Lazarus Saturdayyear (latent)", -6.502790045915623),
+                                    ("<day-of-month> (ordinal or number) <named-month>year (latent)",
+                                     -6.502790045915623),
+                                    ("hhhmmon <day>", -5.586499314041468),
+                                    ("Yom HaShoahyear (latent)", -6.09732493780746),
+                                    ("Thursday<datetime> - <datetime> (interval)",
+                                     -6.09732493780746),
+                                    ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
+                                     -6.502790045915623),
+                                    ("Septemberyear (latent)", -6.09732493780746),
+                                    ("Thursday<time-of-day> - <time-of-day> (interval)",
+                                     -4.99871264913935),
+                                    ("Halloweenyear (latent)", -6.502790045915623),
+                                    ("<ordinal> last <cycle> of <time>year (latent)",
+                                     -6.09732493780746),
+                                    ("from <time-of-day> - <time-of-day> (interval)on <day>",
+                                     -5.809642865355679),
+                                    ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
+                                     -6.502790045915623),
+                                    ("at <time-of-day>intersect", -5.586499314041468),
+                                    ("Rosh Hashanahyear (latent)", -5.809642865355679),
+                                    ("Dhanterasyear (latent)", -6.502790045915623),
+                                    ("Tu BiShvatyear (latent)", -6.502790045915623),
+                                    ("<day-of-month> (ordinal)December", -5.809642865355679),
+                                    ("Holiyear (latent)", -5.809642865355679),
+                                    ("<time-of-day> - <time-of-day> (interval)tomorrow",
+                                     -6.502790045915623),
+                                    ("Holika Dahanyear (latent)", -5.809642865355679),
+                                    ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
+                                     -6.09732493780746),
+                                    ("dayminute", -3.152885958641019),
+                                    ("Mawlidyear (latent)", -6.502790045915623),
+                                    ("from <datetime> - <datetime> (interval)on <day>",
+                                     -6.09732493780746),
+                                    ("<datetime> - <datetime> (interval)tomorrow",
+                                     -6.502790045915623),
+                                    ("Jumu'atul-Widayear (latent)", -5.586499314041468),
+                                    ("minuteday", -2.7651204276322554),
+                                    ("absorption of , after named dayintersect",
+                                     -5.809642865355679),
+                                    ("intersectyear (latent)", -6.502790045915623),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.502790045915623),
+                                    ("time-of-day (latent)in|within|after <duration>",
+                                     -6.502790045915623),
+                                    ("<ordinal> <cycle> of <time>year (latent)",
+                                     -6.502790045915623),
+                                    ("intersecthhhmm", -6.09732493780746),
+                                    ("the <day-of-month> (ordinal)in|during the <part-of-day>",
+                                     -6.502790045915623),
+                                    ("Boss's Dayyear (latent)", -6.09732493780746),
+                                    ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
+                                     -6.502790045915623),
+                                    ("Global Youth Service Dayyear (latent)", -6.502790045915623),
+                                    ("Dhanterasin|during <named-month>|year", -6.502790045915623),
+                                    ("Tisha B'Avyear (latent)", -6.502790045915623),
+                                    ("Isra and Mi'rajyear (latent)", -5.586499314041468),
+                                    ("at <time-of-day>on <day>", -4.893352133481524),
+                                    ("at <time-of-day>absorption of , after named day",
+                                     -6.09732493780746),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.809642865355679),
+                                    ("Christmasyear (latent)", -6.09732493780746),
+                                    ("Saturdayintersect", -6.502790045915623),
+                                    ("Naraka Chaturdashiyear (latent)", -6.09732493780746),
+                                    ("Thai Pongalin|during <named-month>|year", -6.502790045915623),
+                                    ("dayweek", -6.502790045915623),
+                                    ("Easter Sundayyear (latent)", -5.809642865355679),
+                                    ("between <time-of-day> and <time-of-day> (interval)on <day>",
+                                     -6.09732493780746),
+                                    ("Labour Dayyear (latent)", -6.502790045915623),
+                                    ("weekyear", -5.404177757247514),
+                                    ("King's Dayyear (latent)", -4.99871264913935),
+                                    ("hh:mmin|during the <part-of-day>", -5.586499314041468),
+                                    ("<cycle> after|before <time><time-of-day> am|pm",
+                                     -6.09732493780746),
+                                    ("Hanukkahyear (latent)", -5.809642865355679),
+                                    ("Rama Navamiyear (latent)", -6.502790045915623),
+                                    ("February<time> <part-of-day>", -6.502790045915623),
+                                    ("time-of-day (latent)in|during the <part-of-day>",
+                                     -5.809642865355679),
+                                    ("Great Lentyear (latent)", -6.502790045915623),
+                                    ("tomorrowat <time-of-day>", -5.809642865355679),
+                                    ("hhmm (latent)in|during the <part-of-day>",
+                                     -6.502790045915623),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.09732493780746),
+                                    ("Ugadiyear (latent)", -5.1164956847957335),
+                                    ("Vaisakhiyear (latent)", -5.809642865355679),
+                                    ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
+                                     -5.809642865355679),
+                                    ("last <cycle> of <time>year (latent)", -5.809642865355679),
+                                    ("at <time-of-day>tomorrow", -6.09732493780746),
+                                    ("tomorrow<time-of-day> am|pm", -6.502790045915623),
+                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
+                                     -6.502790045915623),
+                                    ("Diwaliyear (latent)", -6.502790045915623),
+                                    ("between <time> and <time>on <day>", -6.09732493780746),
+                                    ("Black Fridayyear (latent)", -6.09732493780746),
+                                    ("the <ordinal> last <cycle> of <time>year (latent)",
+                                     -6.502790045915623),
+                                    ("in|during the <part-of-day>at <time-of-day>",
+                                     -6.502790045915623),
+                                    ("Chhathyear (latent)", -6.09732493780746),
+                                    ("Vasant Panchamiyear (latent)", -6.502790045915623),
+                                    ("Rabindra Jayantiyear (latent)", -5.250027077420255),
+                                    ("this <part-of-day>at <time-of-day>", -5.250027077420255),
+                                    ("St Patrick's Dayyear (latent)", -6.502790045915623),
+                                    ("Thursday<time> (timezone)", -6.502790045915623),
+                                    ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
+                                     -6.502790045915623),
+                                    ("Pargat Diwasyear (latent)", -5.250027077420255),
+                                    ("<datetime> - <datetime> (interval)July", -6.09732493780746),
+                                    ("on <day><named-month> <day-of-month> (non ordinal)",
+                                     -5.809642865355679),
+                                    ("Februaryintersect", -6.502790045915623),
+                                    ("Mother's Dayyear (latent)", -6.502790045915623),
+                                    ("Simchat Torahyear (latent)", -6.502790045915623),
+                                    ("Victoria Dayyear (latent)", -6.09732493780746),
+                                    ("minuteyear", -6.502790045915623)],
+                               n = 514},
+                   koData =
+                     ClassData{prior = -1.0088235607186717, unseen = -6.799055862058796,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("Thursdayhhhmm", -4.600715835638711),
+                                    ("hourday", -3.7068979596166147),
+                                    ("<hour-of-day> <integer><time-of-day> am|pm",
                                      -6.104793232414985),
+                                    ("<day-of-month> (ordinal)August", -6.104793232414985),
+                                    ("dayhour", -3.430644582988456),
+                                    ("<time> timezoneyear (latent)", -5.4116460518550396),
+                                    ("<time-of-day> - <time-of-day> (interval)on <day>",
+                                     -5.18850250054083),
+                                    ("Tuesdayfrom|since|after <time>", -5.4116460518550396),
+                                    ("daymonth", -3.430644582988456),
+                                    ("monthyear", -4.852030263919617),
+                                    ("<time-of-day> am|pmyear (latent)", -5.4116460518550396),
+                                    ("Thai Pongalyear (latent)", -5.4116460518550396),
+                                    ("intersecthh:mm", -6.104793232414985),
+                                    ("from <datetime> - <datetime> (interval)July",
+                                     -5.699328124306821),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.104793232414985),
+                                    ("houryear", -4.718498871295094),
+                                    ("from <time-of-day> - <time-of-day> (interval)July",
+                                     -6.104793232414985),
+                                    ("<day-of-month> (ordinal)October", -6.104793232414985),
+                                    ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
+                                     -5.4116460518550396),
+                                    ("hournograin", -4.852030263919617),
+                                    ("<time-of-day> am|pmintersect", -4.852030263919617),
+                                    ("Octoberyear (latent)", -6.104793232414985),
+                                    ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
+                                     -5.699328124306821),
+                                    ("early morningat <time-of-day>", -6.104793232414985),
+                                    ("until <time>on <day>", -5.4116460518550396),
+                                    ("part of days<time-of-day> - <time-of-day> (interval)",
+                                     -6.104793232414985),
+                                    ("time-of-day (latent)intersect", -5.4116460518550396),
+                                    ("todayin <number> (implicit minutes)", -6.104793232414985),
+                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
+                                     -5.4116460518550396),
+                                    ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
+                                     -6.104793232414985),
+                                    ("about|exactly <time-of-day>year (latent)",
+                                     -6.104793232414985),
+                                    ("hh:mmon <day>", -4.852030263919617),
+                                    ("hhhmmintersect", -5.699328124306821),
+                                    ("absorption of , after named dayJuly", -5.18850250054083),
+                                    ("from|since|after <time>July", -5.699328124306821),
+                                    ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
+                                     -5.18850250054083),
                                     ("Clean Mondayyear (latent)", -6.104793232414985),
                                     ("monthhour", -6.104793232414985),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.817111159963204),
-                                    ("todayat <time-of-day>", -6.51025834052315),
-                                    ("Thursday<time> timezone", -4.112363067724779),
-                                    ("tonight<time-of-day> am|pm", -6.51025834052315),
-                                    ("time-of-day (latent)tonight", -6.104793232414985),
-                                    ("from|since|after <time>December", -6.51025834052315),
-                                    ("<time-of-day> am|pmon <day>", -4.4953553199808844),
-                                    ("this <time>hh(:mm) - <time-of-day> am|pm", -6.51025834052315),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.104793232414985),
-                                    ("dayday", -3.8022081394209395),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.104793232414985),
-                                    ("mm/ddat <time-of-day>", -6.51025834052315),
-                                    ("tonightat <time-of-day>", -5.817111159963204),
-                                    ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.817111159963204),
-                                    ("Dayananda Saraswati Jayantiyear (latent)", -6.51025834052315),
-                                    ("today<time-of-day> am|pm", -6.51025834052315),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.104793232414985),
-                                    ("at <time-of-day><time> <part-of-day>", -6.51025834052315),
-                                    ("<day-of-month> (ordinal)intersect", -6.104793232414985),
-                                    ("mm/dd<time-of-day> am|pm", -6.51025834052315),
-                                    ("hourhour", -3.619886582626985),
-                                    ("Mahavir Jayantiyear (latent)", -6.104793232414985),
-                                    ("Navaratriin|during <named-month>|year", -6.51025834052315),
-                                    ("National Patriots' Dayyear (latent)", -5.817111159963204),
-                                    ("Wednesdaythis|last|next <cycle>", -6.51025834052315),
-                                    ("Lentyear (latent)", -6.51025834052315),
-                                    ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.638456163621558),
-                                    ("Boghiyear (latent)", -6.51025834052315),
-                                    ("dayyear", -1.8706867278177257),
-                                    ("Karva Chauthin|during <named-month>|year", -6.51025834052315),
-                                    ("Thursdayfrom|since|after <time>", -6.104793232414985),
-                                    ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.51025834052315),
-                                    ("Thursdayat <time-of-day>", -5.817111159963204),
-                                    ("Islamic New Yearyear (latent)", -6.104793232414985),
-                                    ("Laylat al-Qadryear (latent)", -5.5939676086489944),
-                                    ("part of days<time-of-day> am|pm", -6.51025834052315),
-                                    ("Discovery Dayyear (latent)", -6.104793232414985),
-                                    ("Shrove Tuesdayyear (latent)", -6.51025834052315),
-                                    ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.817111159963204),
-                                    ("hourminute", -6.104793232414985),
-                                    ("<time-of-day> am|pmtomorrow", -5.817111159963204),
-                                    ("Yom Kippuryear (latent)", -6.51025834052315),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.104793232414985),
-                                    ("<part-of-day> of <time>year (latent)", -6.51025834052315),
-                                    ("minutehour", -5.2574953720277815),
-                                    ("Kaanum Pongalyear (latent)", -6.104793232414985),
-                                    ("Maha Saptamiyear (latent)", -6.51025834052315),
-                                    ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.817111159963204),
-                                    ("time-of-day (latent)tomorrow", -5.5939676086489944),
-                                    ("part of daysat <time-of-day>", -4.900820428089049),
-                                    ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.4953553199808844),
-                                    ("for <duration> from <time>December", -6.51025834052315),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.51025834052315),
-                                    ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.2574953720277815),
-                                    ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.2574953720277815),
-                                    ("time-of-day (latent)this <part-of-day>", -6.51025834052315),
-                                    ("Pentecostyear (latent)", -6.51025834052315),
-                                    ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.2574953720277815),
-                                    ("<day-of-month> (ordinal)February", -6.51025834052315),
-                                    ("Eid al-Fitryear (latent)", -5.123963979403259),
-                                    ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.51025834052315),
-                                    ("Mondayin|during the <part-of-day>", -6.51025834052315),
-                                    ("Chhathin|during <named-month>|year", -6.51025834052315),
-                                    ("Diwaliin|during <named-month>|year", -6.51025834052315),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.51025834052315),
-                                    ("Vaisakhiin|during <named-month>|year", -6.51025834052315),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.2574953720277815),
-                                    ("Raksha Bandhanyear (latent)", -6.51025834052315),
-                                    ("daysecond", -6.104793232414985),
-                                    ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.104793232414985),
-                                    ("Ratha-Yatrayear (latent)", -6.51025834052315),
-                                    ("Ashurayear (latent)", -6.51025834052315),
-                                    ("Tuesdayin|during <named-month>|year", -6.51025834052315),
-                                    ("Chinese New Yearyear (latent)", -6.51025834052315),
-                                    ("tomorrowintersect", -6.51025834052315),
-                                    ("Lag BaOmeryear (latent)", -6.51025834052315),
-                                    ("last weekend of <named-month>year (latent)",
-                                     -6.51025834052315),
-                                    ("Eid al-Adhayear (latent)", -4.370192177026879),
-                                    ("intersectin|during the <part-of-day>", -6.51025834052315),
-                                    ("Palm Sundayyear (latent)", -6.51025834052315),
-                                    ("Christmasat <time-of-day>", -6.51025834052315),
-                                    ("Passoveryear (latent)", -6.51025834052315),
-                                    ("Lazarus Saturdayyear (latent)", -6.51025834052315),
-                                    ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.51025834052315),
-                                    ("hhhmmon <day>", -5.5939676086489944),
-                                    ("Yom HaShoahyear (latent)", -6.104793232414985),
-                                    ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.104793232414985),
-                                    ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.51025834052315),
-                                    ("Septemberyear (latent)", -6.104793232414985),
-                                    ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.006180943746876),
-                                    ("Halloweenyear (latent)", -6.51025834052315),
-                                    ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.104793232414985),
-                                    ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.817111159963204),
-                                    ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.51025834052315),
-                                    ("at <time-of-day>intersect", -5.5939676086489944),
-                                    ("Rosh Hashanahyear (latent)", -5.817111159963204),
-                                    ("Dhanterasyear (latent)", -6.51025834052315),
-                                    ("Tu BiShvatyear (latent)", -6.51025834052315),
-                                    ("<day-of-month> (ordinal)December", -5.817111159963204),
-                                    ("Holiyear (latent)", -5.817111159963204),
-                                    ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.51025834052315),
-                                    ("Holika Dahanyear (latent)", -5.817111159963204),
-                                    ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.104793232414985),
-                                    ("dayminute", -3.1603542532485447),
-                                    ("Mawlidyear (latent)", -6.51025834052315),
-                                    ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.104793232414985),
-                                    ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.51025834052315),
-                                    ("Jumu'atul-Widayear (latent)", -5.5939676086489944),
-                                    ("minuteday", -2.70359585075283),
-                                    ("absorption of , after named dayintersect",
-                                     -5.817111159963204),
-                                    ("intersectyear (latent)", -6.51025834052315),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.51025834052315),
-                                    ("time-of-day (latent)in|within|after <duration>",
-                                     -6.51025834052315),
-                                    ("<ordinal> <cycle> of <time>year (latent)", -6.51025834052315),
-                                    ("intersecthhhmm", -6.104793232414985),
-                                    ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.51025834052315),
-                                    ("Boss's Dayyear (latent)", -6.104793232414985),
-                                    ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.51025834052315),
-                                    ("Global Youth Service Dayyear (latent)", -6.51025834052315),
-                                    ("Dhanterasin|during <named-month>|year", -6.51025834052315),
-                                    ("Tisha B'Avyear (latent)", -6.51025834052315),
-                                    ("Isra and Mi'rajyear (latent)", -5.5939676086489944),
-                                    ("at <time-of-day>on <day>", -4.900820428089049),
-                                    ("at <time-of-day>absorption of , after named day",
-                                     -6.104793232414985),
-                                    ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.817111159963204),
-                                    ("Christmasyear (latent)", -6.104793232414985),
-                                    ("Saturdayintersect", -6.51025834052315),
-                                    ("Naraka Chaturdashiyear (latent)", -6.104793232414985),
-                                    ("Thai Pongalin|during <named-month>|year", -6.51025834052315),
-                                    ("dayweek", -6.51025834052315),
-                                    ("Easter Sundayyear (latent)", -5.817111159963204),
-                                    ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.4116460518550396),
-                                    ("Labour Dayyear (latent)", -6.51025834052315),
-                                    ("weekyear", -5.4116460518550396),
-                                    ("King's Dayyear (latent)", -5.006180943746876),
-                                    ("hh:mmin|during the <part-of-day>", -5.5939676086489944),
-                                    ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.104793232414985),
-                                    ("Hanukkahyear (latent)", -5.817111159963204),
-                                    ("Rama Navamiyear (latent)", -6.51025834052315),
-                                    ("February<time> <part-of-day>", -6.51025834052315),
-                                    ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.817111159963204),
-                                    ("Great Lentyear (latent)", -6.51025834052315),
-                                    ("tomorrowat <time-of-day>", -5.817111159963204),
-                                    ("hhmm (latent)in|during the <part-of-day>", -6.51025834052315),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.104793232414985),
-                                    ("Ugadiyear (latent)", -5.123963979403259),
-                                    ("Vaisakhiyear (latent)", -5.817111159963204),
-                                    ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.817111159963204),
-                                    ("last <cycle> of <time>year (latent)", -5.817111159963204),
-                                    ("at <time-of-day>tomorrow", -6.104793232414985),
-                                    ("tomorrow<time-of-day> am|pm", -6.51025834052315),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.51025834052315),
-                                    ("Diwaliyear (latent)", -6.51025834052315),
-                                    ("between <time> and <time>on <day>", -5.4116460518550396),
-                                    ("Black Fridayyear (latent)", -6.104793232414985),
-                                    ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.51025834052315),
-                                    ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.51025834052315),
-                                    ("Chhathyear (latent)", -6.104793232414985),
-                                    ("Vasant Panchamiyear (latent)", -6.51025834052315),
-                                    ("Rabindra Jayantiyear (latent)", -5.2574953720277815),
-                                    ("this <part-of-day>at <time-of-day>", -5.2574953720277815),
-                                    ("St Patrick's Dayyear (latent)", -6.51025834052315),
-                                    ("Thursday<time> (timezone)", -6.51025834052315),
-                                    ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.51025834052315),
-                                    ("Pargat Diwasyear (latent)", -5.2574953720277815),
-                                    ("<datetime> - <datetime> (interval)July", -6.104793232414985),
-                                    ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.817111159963204),
-                                    ("Februaryintersect", -6.51025834052315),
-                                    ("Mother's Dayyear (latent)", -6.51025834052315),
-                                    ("Simchat Torahyear (latent)", -6.51025834052315),
-                                    ("Victoria Dayyear (latent)", -6.104793232414985),
-                                    ("minuteyear", -6.51025834052315)],
-                               n = 520},
-                   koData =
-                     ClassData{prior = -1.0183805986638588, unseen = -6.794586580876499,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("Thursdayhhhmm", -4.59624155524379),
-                                    ("hourday", -3.5745903077118086),
-                                    ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.100318952020064),
-                                    ("<day-of-month> (ordinal)August", -6.100318952020064),
-                                    ("dayhour", -3.4261703025935355),
-                                    ("<time> timezoneyear (latent)", -5.407171771460119),
-                                    ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.184028220145909),
-                                    ("Tuesdayfrom|since|after <time>", -5.407171771460119),
-                                    ("daymonth", -3.4261703025935355),
-                                    ("monthyear", -4.847555983524696),
-                                    ("<time-of-day> am|pmyear (latent)", -5.407171771460119),
-                                    ("Thai Pongalyear (latent)", -5.407171771460119),
-                                    ("intersecthh:mm", -6.100318952020064),
-                                    ("from <datetime> - <datetime> (interval)July",
-                                     -5.6948538439119),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.100318952020064),
-                                    ("houryear", -4.7140245909001735),
-                                    ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.100318952020064),
-                                    ("<day-of-month> (ordinal)October", -6.100318952020064),
-                                    ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.407171771460119),
-                                    ("hournograin", -4.847555983524696),
-                                    ("<time-of-day> am|pmintersect", -4.847555983524696),
-                                    ("Octoberyear (latent)", -6.100318952020064),
-                                    ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.6948538439119),
-                                    ("early morningat <time-of-day>", -6.100318952020064),
-                                    ("until <time>on <day>", -5.407171771460119),
-                                    ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.100318952020064),
-                                    ("time-of-day (latent)intersect", -5.407171771460119),
-                                    ("todayin <number> (implicit minutes)", -6.100318952020064),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.407171771460119),
-                                    ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.100318952020064),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.100318952020064),
-                                    ("hh:mmon <day>", -4.490881039585964),
-                                    ("hhhmmintersect", -5.6948538439119),
-                                    ("absorption of , after named dayJuly", -5.184028220145909),
-                                    ("from|since|after <time>July", -5.6948538439119),
-                                    ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.184028220145909),
-                                    ("Clean Mondayyear (latent)", -6.100318952020064),
-                                    ("monthhour", -6.100318952020064),
-                                    ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.6948538439119),
-                                    ("hourmonth", -4.2285167751184725),
-                                    ("todayat <time-of-day>", -6.100318952020064),
-                                    ("hhhmmyear (latent)", -4.847555983524696),
-                                    ("from|since|after <time>December", -6.100318952020064),
+                                     -5.699328124306821),
+                                    ("hourmonth", -4.232991055513394),
+                                    ("todayat <time-of-day>", -6.104793232414985),
+                                    ("hhhmmyear (latent)", -4.852030263919617),
+                                    ("from|since|after <time>December", -6.104793232414985),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.100318952020064),
-                                    ("<time-of-day> am|pmon <day>", -4.847555983524696),
-                                    ("Mondayyear (latent)", -5.407171771460119),
-                                    ("dayday", -4.7140245909001735),
-                                    ("mm/ddat <time-of-day>", -5.6948538439119),
-                                    ("on <day>September", -5.407171771460119),
-                                    ("time-of-day (latent)September", -5.6948538439119),
-                                    ("hourhour", -4.020877410340228),
-                                    ("time-of-day (latent)on <day>", -4.308559482792009),
+                                     -6.104793232414985),
+                                    ("<time-of-day> am|pmon <day>", -4.852030263919617),
+                                    ("Mondayyear (latent)", -5.4116460518550396),
+                                    ("dayday", -4.089890211872721),
+                                    ("mm/ddat <time-of-day>", -5.699328124306821),
+                                    ("on <day>September", -5.4116460518550396),
+                                    ("time-of-day (latent)September", -5.699328124306821),
+                                    ("hourhour", -4.02535169073515),
+                                    ("time-of-day (latent)on <day>", -4.600715835638711),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.6948538439119),
-                                    ("dayyear", -3.1558799728536235),
-                                    ("Thursdaymm/dd", -6.100318952020064),
-                                    ("New Year's Dayyear (latent)", -5.184028220145909),
-                                    ("time-of-day (latent)Sunday", -5.6948538439119),
-                                    ("Thursdayfrom|since|after <time>", -4.395570859781639),
-                                    ("Thursdayat <time-of-day>", -4.490881039585964),
+                                     -5.699328124306821),
+                                    ("dayyear", -3.1603542532485447),
+                                    ("Thursdaymm/dd", -6.104793232414985),
+                                    ("New Year's Dayyear (latent)", -5.18850250054083),
+                                    ("time-of-day (latent)Sunday", -5.699328124306821),
+                                    ("Thursdayfrom|since|after <time>", -4.40004514017656),
+                                    ("Thursdayat <time-of-day>", -4.4953553199808844),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.100318952020064),
-                                    ("Aprilyear (latent)", -6.100318952020064),
-                                    ("the <day-of-month> (ordinal)July", -6.100318952020064),
-                                    ("the <day-of-month> (number)July", -6.100318952020064),
-                                    ("monthminute", -6.100318952020064),
-                                    ("<time-of-day> am|pmtomorrow", -6.100318952020064),
-                                    ("Thursdayhh:mm", -5.184028220145909),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.6948538439119),
-                                    ("minutemonth", -3.9602527885237935),
-                                    ("time-of-day (latent)Friday", -5.6948538439119),
-                                    ("minutehour", -6.100318952020064),
-                                    ("part of daysat <time-of-day>", -5.001706663351954),
-                                    ("Augustyear (latent)", -5.6948538439119),
-                                    ("week-endin|during <named-month>|year", -6.100318952020064),
-                                    ("time-of-day (latent)Tuesday", -5.6948538439119),
+                                     -6.104793232414985),
+                                    ("Aprilyear (latent)", -6.104793232414985),
+                                    ("the <day-of-month> (ordinal)July", -6.104793232414985),
+                                    ("the <day-of-month> (number)July", -6.104793232414985),
+                                    ("monthminute", -6.104793232414985),
+                                    ("<time-of-day> am|pmtomorrow", -6.104793232414985),
+                                    ("Thursdayhh:mm", -5.18850250054083),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.699328124306821),
+                                    ("minutemonth", -3.9647270689187146),
+                                    ("time-of-day (latent)Friday", -5.699328124306821),
+                                    ("minutehour", -6.104793232414985),
+                                    ("part of daysat <time-of-day>", -5.006180943746876),
+                                    ("Augustyear (latent)", -5.699328124306821),
+                                    ("week-endin|during <named-month>|year", -6.104793232414985),
+                                    ("time-of-day (latent)Tuesday", -5.699328124306821),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.6948538439119),
+                                     -5.699328124306821),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.100318952020064),
+                                     -6.104793232414985),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.100318952020064),
-                                    ("Sundayyear (latent)", -5.184028220145909),
-                                    ("Christmasat <time-of-day>", -6.100318952020064),
-                                    ("from|since|after <time>year (latent)", -5.001706663351954),
-                                    ("hhhmmon <day>", -5.184028220145909),
-                                    ("yesterday<time-of-day> am|pm", -6.100318952020064),
-                                    ("<day-of-month> (ordinal)July", -5.407171771460119),
+                                     -6.104793232414985),
+                                    ("Sundayyear (latent)", -5.18850250054083),
+                                    ("the <day-of-month> (ordinal)Monday", -5.4116460518550396),
+                                    ("Christmasat <time-of-day>", -6.104793232414985),
+                                    ("from|since|after <time>year (latent)", -5.006180943746876),
+                                    ("hhhmmon <day>", -5.18850250054083),
+                                    ("yesterday<time-of-day> am|pm", -6.104793232414985),
+                                    ("<day-of-month> (ordinal)July", -5.4116460518550396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.100318952020064),
-                                    ("mm/ddyear (latent)", -6.100318952020064),
+                                     -6.104793232414985),
+                                    ("mm/ddyear (latent)", -6.104793232414985),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.100318952020064),
+                                     -6.104793232414985),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.100318952020064),
-                                    ("at <time-of-day>intersect", -5.184028220145909),
-                                    ("hh:mmyear (latent)", -4.7140245909001735),
-                                    ("Holiyear (latent)", -6.100318952020064),
-                                    ("until <time><time-of-day> am|pm", -6.100318952020064),
+                                     -6.104793232414985),
+                                    ("at <time-of-day>intersect", -5.18850250054083),
+                                    ("hh:mmyear (latent)", -4.718498871295094),
+                                    ("Holiyear (latent)", -6.104793232414985),
+                                    ("until <time><time-of-day> am|pm", -6.104793232414985),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.6948538439119),
-                                    ("dayminute", -3.2381180710905957),
-                                    ("yyyy-mm-ddhh:mm", -5.6948538439119),
-                                    ("intersectfrom|since|after <time>", -5.6948538439119),
-                                    ("intersectSeptember", -4.2285167751184725),
-                                    ("minuteday", -2.8814431271518632),
+                                     -5.699328124306821),
+                                    ("dayminute", -3.242592351485517),
+                                    ("yyyy-mm-ddhh:mm", -5.699328124306821),
+                                    ("intersectfrom|since|after <time>", -5.699328124306821),
+                                    ("intersectSeptember", -4.232991055513394),
+                                    ("minuteday", -2.947792811264872),
                                     ("absorption of , after named dayintersect",
-                                     -6.100318952020064),
-                                    ("intersectyear (latent)", -6.100318952020064),
-                                    ("Februaryin|during the <part-of-day>", -6.100318952020064),
+                                     -6.104793232414985),
+                                    ("intersectyear (latent)", -6.104793232414985),
+                                    ("Februaryin|during the <part-of-day>", -6.104793232414985),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.100318952020064),
-                                    ("time-of-day (latent)July", -5.407171771460119),
-                                    ("Saturdayyear (latent)", -6.100318952020064),
+                                     -6.104793232414985),
+                                    ("time-of-day (latent)July", -5.4116460518550396),
+                                    ("Saturdayyear (latent)", -6.104793232414985),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.100318952020064),
-                                    ("at <time-of-day>on <day>", -5.184028220145909),
+                                     -6.104793232414985),
+                                    ("<day-of-month> (ordinal)Monday", -5.18850250054083),
+                                    ("at <time-of-day>on <day>", -5.18850250054083),
                                     ("absorption of , after named daySeptember",
-                                     -4.847555983524696),
-                                    ("Naraka Chaturdashiyear (latent)", -6.100318952020064),
-                                    ("from|since|after <time>on <day>", -5.184028220145909),
-                                    ("dayweek", -6.100318952020064),
-                                    ("Easter Sundayyear (latent)", -5.6948538439119),
-                                    ("Thursday<time-of-day> am|pm", -4.847555983524696),
-                                    ("weekyear", -5.6948538439119),
-                                    ("time-of-day (latent)Thursday", -5.6948538439119),
+                                     -4.852030263919617),
+                                    ("Naraka Chaturdashiyear (latent)", -6.104793232414985),
+                                    ("from|since|after <time>on <day>", -5.18850250054083),
+                                    ("dayweek", -6.104793232414985),
+                                    ("Easter Sundayyear (latent)", -5.699328124306821),
+                                    ("Thursday<time-of-day> am|pm", -4.852030263919617),
+                                    ("weekyear", -5.699328124306821),
+                                    ("time-of-day (latent)Thursday", -5.699328124306821),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.100318952020064),
-                                    ("<day-of-month> (ordinal)April", -6.100318952020064),
+                                     -6.104793232414985),
+                                    ("<day-of-month> (ordinal)April", -6.104793232414985),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.6948538439119),
+                                     -5.699328124306821),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.407171771460119),
-                                    ("Sundayfrom|since|after <time>", -6.100318952020064),
-                                    ("absorption of , after named dayFebruary", -5.184028220145909),
+                                     -5.4116460518550396),
+                                    ("Sundayfrom|since|after <time>", -6.104793232414985),
+                                    ("absorption of , after named dayFebruary", -5.18850250054083),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.6948538439119),
+                                     -5.699328124306821),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.100318952020064),
-                                    ("tomorrowat <time-of-day>", -6.100318952020064),
-                                    ("daynograin", -5.6948538439119),
+                                     -6.104793232414985),
+                                    ("tomorrowat <time-of-day>", -6.104793232414985),
+                                    ("daynograin", -5.699328124306821),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.6948538439119),
-                                    ("last <cycle> of <time>year (latent)", -5.6948538439119),
-                                    ("tomorrow<time-of-day> am|pm", -6.100318952020064),
+                                     -5.699328124306821),
+                                    ("last <cycle> of <time>year (latent)", -5.699328124306821),
+                                    ("tomorrow<time-of-day> am|pm", -6.104793232414985),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.407171771460119),
-                                    ("Diwaliyear (latent)", -5.6948538439119),
+                                     -5.4116460518550396),
+                                    ("Diwaliyear (latent)", -5.699328124306821),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.100318952020064),
-                                    ("this <part-of-day>at <time-of-day>", -5.184028220145909),
-                                    ("Fridayyear (latent)", -5.6948538439119),
-                                    ("time-of-day (latent)April", -6.100318952020064),
-                                    ("minuteyear", -3.9030943746838447)],
-                               n = 294}}),
+                                     -6.104793232414985),
+                                    ("this <part-of-day>at <time-of-day>", -5.18850250054083),
+                                    ("Fridayyear (latent)", -5.699328124306821),
+                                    ("time-of-day (latent)April", -6.104793232414985),
+                                    ("minuteyear", -3.907568655078766)],
+                               n = 295}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1464,8 +1485,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4011973816621555,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 28},
+                     ClassData{prior = 0.0, unseen = -3.5263605246161616,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 32},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1755,10 +1776,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("yesterday",
@@ -1840,27 +1861,28 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1938,12 +1960,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2167,27 +2189,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15600424847658126, unseen = -5.10594547390058,
+                     ClassData{prior = -0.23700058597563592,
+                               unseen = -5.220355825078324,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.1295745142720766),
-                                    ("month (grain)", -2.797281334830153),
-                                    ("year (grain)", -2.5349170703626616),
-                                    ("week (grain)", -1.1295745142720766),
-                                    ("quarter", -3.4904285153900982), ("year", -2.5349170703626616),
-                                    ("month", -2.797281334830153),
-                                    ("quarter (grain)", -3.4904285153900982)],
-                               n = 77},
+                                   [("week", -1.2446438440568637),
+                                    ("month (grain)", -2.5068855565067754),
+                                    ("year (grain)", -2.3817224135527697),
+                                    ("week (grain)", -1.2446438440568637),
+                                    ("quarter", -3.6054978451748854), ("year", -2.3817224135527697),
+                                    ("month", -2.5068855565067754),
+                                    ("quarter (grain)", -3.6054978451748854)],
+                               n = 86},
                    koData =
-                     ClassData{prior = -1.9348603128687285,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.555853666299994, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Mother's Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2279,7 +2305,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3856624808119846, unseen = -2.995732273553991,
+                     ClassData{prior = -0.4989911661189879, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2287,14 +2313,13 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.1394342831883648,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -0.9343092373768334, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -0.916290731874155),
-                                    ("ordinal (digits)", -0.5108256237659907)],
-                               n = 8}}),
+                                     -0.6190392084062235),
+                                    ("ordinal (digits)", -0.7731898882334817)],
+                               n = 11}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2394,19 +2419,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6481498146292096, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6227247162633995, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7402651035370151, unseen = -4.762173934797756,
+                     ClassData{prior = -0.7689072264414809, unseen = -4.709530201312334,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.145896398214498e-2),
-                                    ("integer (0..19)", -2.6741486494265287)],
-                               n = 114}}),
+                                   [("integer (numeric)", -7.550755250814517e-2),
+                                    ("integer (0..19)", -2.6210388241125804)],
+                               n = 108}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2539,21 +2564,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.1941560144409575, unseen = -4.189654742026425,
+                     ClassData{prior = -0.21511137961694557, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6894806201076367),
-                                    ("mm/dd", -3.481240089335692),
-                                    ("absorption of , after named day", -2.7880929087757464),
-                                    ("intersect", -2.7880929087757464),
-                                    ("Saturday", -2.7880929087757464),
-                                    ("Friday", -3.0757749812275272), ("day", -0.807091439909163),
-                                    ("the <day-of-month> (ordinal)", -3.0757749812275272),
+                                   [("Thursday", -1.8803128665695), ("mm/dd", -3.3843902633457743),
+                                    ("absorption of , after named day", -2.691243082785829),
+                                    ("intersect", -2.691243082785829),
+                                    ("Saturday", -2.691243082785829),
+                                    ("Friday", -2.9789251552376097), ("day", -0.8194409058842375),
+                                    ("the <day-of-month> (ordinal)", -2.9789251552376097),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.7880929087757464)],
-                               n = 28},
+                                     -2.691243082785829)],
+                               n = 25},
                    koData =
-                     ClassData{prior = -1.7346010553881064,
+                     ClassData{prior = -1.6422277352570913,
                                unseen = -3.0910424533583156,
                                likelihoods =
                                  HashMap.fromList
@@ -2636,15 +2660,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2668,11 +2698,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12361395596717664,
-                               unseen = -4.356708826689592,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 76},
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -4.276666119016055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 70},
                    koData =
-                     ClassData{prior = -2.151762203259462, unseen = -2.4849066497880004,
+                     ClassData{prior = -2.0794415416798357,
+                               unseen = -2.4849066497880004,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
@@ -2717,19 +2748,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -0.15415067982725836,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -0.12783337150988489,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -1.9459101490553135,
-                               unseen = -1.6094379124341003,
+                     ClassData{prior = -2.120263536200091, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("Mawlid",
         Classifier{okData =
@@ -2911,68 +2943,69 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5861750610077776, unseen = -5.342334251964811,
+                     ClassData{prior = -0.5736020299101626,
+                               unseen = -5.3612921657094255,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.6443908991413725),
-                                    ("dayhour", -4.238925791033208),
-                                    ("daymonth", -2.293015641977895),
+                                     -4.663439094112067),
+                                    ("dayhour", -4.257973986003902),
+                                    ("daymonth", -2.2210920587428626),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.6443908991413725),
+                                     -4.663439094112067),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.391627930646005),
-                                    ("Wednesdayintersect", -4.6443908991413725),
+                                     -3.4106761256166993),
+                                    ("Wednesdayintersect", -4.663439094112067),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.258096538021482),
-                                    ("Black Fridaythis|last|next <cycle>", -4.6443908991413725),
-                                    ("Labour Daythis|last|next <cycle>", -4.6443908991413725),
-                                    ("<part-of-day> of <time>February", -4.6443908991413725),
-                                    ("Saturday<time-of-day> am|pm", -4.6443908991413725),
+                                     -3.2771447329921766),
+                                    ("Black Fridaythis|last|next <cycle>", -4.663439094112067),
+                                    ("Labour Daythis|last|next <cycle>", -4.663439094112067),
+                                    ("<part-of-day> of <time>February", -4.663439094112067),
+                                    ("Saturday<time-of-day> am|pm", -4.663439094112067),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.238925791033208),
-                                    ("hourmonth", -4.6443908991413725),
+                                     -4.257973986003902),
+                                    ("hourmonth", -4.663439094112067),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.951243718581427),
-                                    ("dayday", -2.3930991005348776),
-                                    ("the <day-of-month> (ordinal)February", -4.238925791033208),
-                                    ("WednesdayOctober", -4.6443908991413725),
-                                    ("Wednesdaythis|last|next <cycle>", -4.238925791033208),
+                                     -3.970291913552122),
+                                    ("dayday", -2.412147295505572),
+                                    ("the <day-of-month> (ordinal)February", -4.257973986003902),
+                                    ("WednesdayOctober", -4.663439094112067),
+                                    ("Wednesdaythis|last|next <cycle>", -4.257973986003902),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.391627930646005),
-                                    ("dayyear", -3.545778610473263),
+                                     -3.4106761256166993),
+                                    ("dayyear", -3.5648268054439574),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.6443908991413725),
-                                    ("Thursdayhh:mm", -4.238925791033208),
-                                    ("Thanksgiving Daythis|last|next <cycle>", -4.6443908991413725),
-                                    ("TuesdayOctober", -4.6443908991413725),
-                                    ("the <day-of-month> (ordinal)March", -4.6443908991413725),
-                                    ("Mondaythis|last|next <cycle>", -4.6443908991413725),
-                                    ("Fridayintersect", -3.951243718581427),
+                                     -4.663439094112067),
+                                    ("Thursdayhh:mm", -4.257973986003902),
+                                    ("Thanksgiving Daythis|last|next <cycle>", -4.663439094112067),
+                                    ("TuesdayOctober", -4.663439094112067),
+                                    ("the <day-of-month> (ordinal)March", -4.663439094112067),
+                                    ("Mondaythis|last|next <cycle>", -3.970291913552122),
+                                    ("Fridayintersect", -3.970291913552122),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.238925791033208),
-                                    ("intersectOctober", -4.238925791033208),
+                                     -4.257973986003902),
+                                    ("intersectOctober", -4.257973986003902),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.7281001672672174),
-                                    ("Tuesdaythis|last|next <cycle>", -4.6443908991413725),
+                                     -3.747148362237912),
+                                    ("Tuesdaythis|last|next <cycle>", -4.663439094112067),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.6443908991413725),
-                                    ("dayminute", -2.8526314299133175),
-                                    ("minuteday", -3.391627930646005),
-                                    ("this|last|next <cycle>Sunday", -4.6443908991413725),
-                                    ("Sundaythis|last|next <cycle>", -4.6443908991413725),
-                                    ("on <day><time-of-day> am|pm", -4.6443908991413725),
-                                    ("intersectintersect", -4.6443908991413725),
-                                    ("weekday", -4.6443908991413725),
-                                    ("dayweek", -3.545778610473263),
+                                     -4.663439094112067),
+                                    ("dayminute", -2.871679624884012),
+                                    ("minuteday", -3.4106761256166993),
+                                    ("this|last|next <cycle>Sunday", -4.663439094112067),
+                                    ("Sundaythis|last|next <cycle>", -4.663439094112067),
+                                    ("on <day><time-of-day> am|pm", -4.663439094112067),
+                                    ("intersectintersect", -4.663439094112067),
+                                    ("weekday", -4.663439094112067),
+                                    ("dayweek", -3.5648268054439574),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.238925791033208),
-                                    ("<datetime> - <datetime> (interval)July", -3.7281001672672174),
+                                     -4.257973986003902),
+                                    ("<datetime> - <datetime> (interval)July", -3.747148362237912),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.951243718581427)],
-                               n = 69},
+                                     -3.970291913552122)],
+                               n = 71},
                    koData =
-                     ClassData{prior = -0.812948380372566, unseen = -5.198497031265826,
+                     ClassData{prior = -0.828948721719007, unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.499809670330265),
@@ -3081,7 +3114,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -3090,14 +3123,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3308,14 +3340,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3816,31 +3848,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_GB.hs b/Duckling/Ranking/Classifiers/EN_GB.hs
index e8b8f140..6d965200 100644
--- a/Duckling/Ranking/Classifiers/EN_GB.hs
+++ b/Duckling/Ranking/Classifiers/EN_GB.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5960268527875748, unseen = -6.156978985585555,
+                     ClassData{prior = -0.5818589652688437, unseen = -6.156978985585555,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 470},
                    koData =
-                     ClassData{prior = -0.8007245583110331, unseen = -5.953243334287785,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 383}}),
+                     ClassData{prior = -0.818389597365513, unseen = -5.921578419643816,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 371}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -620,28 +621,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -680,11 +681,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -853,6 +855,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -934,465 +948,469 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4663203838294391, unseen = -7.188412736496954,
+                     ClassData{prior = -0.47198579044972677,
+                               unseen = -7.1808311990445555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.494509983555011),
-                                    ("Father's Dayyear (latent)", -6.494509983555011),
-                                    ("Karva Chauthyear (latent)", -6.494509983555011),
+                                   [("Navaratriyear (latent)", -6.486922693742851),
+                                    ("Father's Dayyear (latent)", -6.486922693742851),
+                                    ("Karva Chauthyear (latent)", -6.486922693742851),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.494509983555011),
-                                    ("Maha Shivaratriyear (latent)", -6.494509983555011),
-                                    ("Ramadanyear (latent)", -5.241747015059643),
+                                     -6.486922693742851),
+                                    ("Maha Shivaratriyear (latent)", -6.486922693742851),
+                                    ("Ramadanyear (latent)", -5.2341597252474825),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.10821562243512),
-                                    ("Bhai Doojyear (latent)", -6.494509983555011),
-                                    ("hourday", -4.4796069630127455),
-                                    ("dayhour", -3.4499875458315876),
+                                     -5.100628332622961),
+                                    ("Bhai Doojyear (latent)", -6.486922693742851),
+                                    ("hourday", -4.472019673200586),
+                                    ("dayhour", -3.442400256019428),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.10821562243512),
-                                    ("Martin Luther King's Dayyear (latent)", -6.089044875446846),
-                                    ("Shemini Atzeretyear (latent)", -6.494509983555011),
-                                    ("daymonth", -4.4796069630127455),
-                                    ("monthday", -6.089044875446846),
-                                    ("monthyear", -4.702750514326955),
-                                    ("Yom Ha'atzmautyear (latent)", -6.494509983555011),
-                                    ("Vijayadashamiyear (latent)", -6.494509983555011),
-                                    ("Thanksgiving Dayyear (latent)", -5.395897694886901),
-                                    ("Thai Pongalyear (latent)", -5.801362802995065),
-                                    ("Thiru Onamyear (latent)", -5.801362802995065),
-                                    ("hhhmmabsorption of , after named day", -6.494509983555011),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.494509983555011),
+                                     -5.100628332622961),
+                                    ("Martin Luther King's Dayyear (latent)", -6.081457585634687),
+                                    ("Shemini Atzeretyear (latent)", -6.486922693742851),
+                                    ("daymonth", -4.472019673200586),
+                                    ("monthday", -6.081457585634687),
+                                    ("monthyear", -4.695163224514796),
+                                    ("Yom Ha'atzmautyear (latent)", -6.486922693742851),
+                                    ("Vijayadashamiyear (latent)", -6.486922693742851),
+                                    ("Thanksgiving Dayyear (latent)", -5.3883104050747415),
+                                    ("Thai Pongalyear (latent)", -5.793775513182905),
+                                    ("Thiru Onamyear (latent)", -5.793775513182905),
+                                    ("hhhmmabsorption of , after named day", -6.486922693742851),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.486922693742851),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.5782192516808555),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.494509983555011),
-                                    ("Krishna Janmashtamiyear (latent)", -6.089044875446846),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.494509983555011),
-                                    ("houryear", -5.5782192516808555),
+                                     -5.5706319618686955),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.486922693742851),
+                                    ("Krishna Janmashtamiyear (latent)", -6.081457585634687),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.486922693742851),
+                                    ("houryear", -5.5706319618686955),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.494509983555011),
-                                    ("Christmas<time-of-day> am|pm", -6.494509983555011),
+                                     -6.486922693742851),
+                                    ("Christmas<time-of-day> am|pm", -6.486922693742851),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.494509983555011),
+                                     -6.486922693742851),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.801362802995065),
-                                    ("intersectin|during <named-month>|year", -6.494509983555011),
-                                    ("<time-of-day> am|pmintersect", -5.241747015059643),
-                                    ("Earth Houryear (latent)", -6.494509983555011),
-                                    ("Ganesh Chaturthiyear (latent)", -6.494509983555011),
-                                    ("Octoberyear (latent)", -4.990432586778736),
-                                    ("intersect<time-of-day> am|pm", -6.494509983555011),
-                                    ("Mattu Pongalyear (latent)", -6.494509983555011),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.494509983555011),
-                                    ("Shavuotyear (latent)", -6.494509983555011),
-                                    ("Parsi New Yearyear (latent)", -5.5782192516808555),
+                                     -5.793775513182905),
+                                    ("intersectin|during <named-month>|year", -6.486922693742851),
+                                    ("<time-of-day> am|pmintersect", -5.2341597252474825),
+                                    ("Earth Houryear (latent)", -6.486922693742851),
+                                    ("Ganesh Chaturthiyear (latent)", -6.486922693742851),
+                                    ("Octoberyear (latent)", -4.982845296966577),
+                                    ("intersect<time-of-day> am|pm", -6.486922693742851),
+                                    ("Mattu Pongalyear (latent)", -6.486922693742851),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.486922693742851),
+                                    ("Shavuotyear (latent)", -6.486922693742851),
+                                    ("Parsi New Yearyear (latent)", -5.5706319618686955),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.494509983555011),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.494509983555011),
-                                    ("todayin|within|after <duration>", -6.494509983555011),
+                                     -6.486922693742851),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.486922693742851),
+                                    ("todayin|within|after <duration>", -6.486922693742851),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.089044875446846),
-                                    ("Marchyear (latent)", -6.494509983555011),
+                                     -6.081457585634687),
+                                    ("Marchyear (latent)", -6.486922693742851),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.089044875446846),
-                                    ("Sukkotyear (latent)", -6.089044875446846),
-                                    ("hhhmmintersect", -6.089044875446846),
+                                     -6.081457585634687),
+                                    ("Sukkotyear (latent)", -6.081457585634687),
+                                    ("hhhmmintersect", -6.081457585634687),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.089044875446846),
-                                    ("Clean Mondayyear (latent)", -6.089044875446846),
-                                    ("monthhour", -6.089044875446846),
+                                     -6.081457585634687),
+                                    ("Clean Mondayyear (latent)", -6.081457585634687),
+                                    ("monthhour", -6.081457585634687),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.801362802995065),
-                                    ("todayat <time-of-day>", -6.494509983555011),
-                                    ("Thursday<time> timezone", -4.09661471075664),
-                                    ("tonight<time-of-day> am|pm", -6.494509983555011),
-                                    ("time-of-day (latent)tonight", -6.089044875446846),
-                                    ("from|since|after <time>December", -6.494509983555011),
-                                    ("dd/mm<time-of-day> am|pm", -6.494509983555011),
-                                    ("<time-of-day> am|pmon <day>", -4.4796069630127455),
+                                     -5.793775513182905),
+                                    ("todayat <time-of-day>", -6.486922693742851),
+                                    ("Thursday<time> timezone", -4.089027420944481),
+                                    ("tonight<time-of-day> am|pm", -6.486922693742851),
+                                    ("time-of-day (latent)tonight", -6.081457585634687),
+                                    ("from|since|after <time>December", -6.486922693742851),
+                                    ("dd/mm<time-of-day> am|pm", -6.486922693742851),
+                                    ("<time-of-day> am|pmon <day>", -4.472019673200586),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.494509983555011),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.089044875446846),
-                                    ("dayday", -3.7864597824528),
-                                    ("dd/mmat <time-of-day>", -6.494509983555011),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.089044875446846),
-                                    ("tonightat <time-of-day>", -5.801362802995065),
+                                     -6.486922693742851),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.081457585634687),
+                                    ("dayday", -3.778872492640641),
+                                    ("dd/mmat <time-of-day>", -6.486922693742851),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.081457585634687),
+                                    ("tonightat <time-of-day>", -5.793775513182905),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.801362802995065),
+                                     -5.793775513182905),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.494509983555011),
-                                    ("today<time-of-day> am|pm", -6.494509983555011),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.089044875446846),
-                                    ("at <time-of-day><time> <part-of-day>", -6.494509983555011),
-                                    ("<day-of-month> (ordinal)intersect", -6.089044875446846),
-                                    ("hourhour", -3.6041382256588457),
-                                    ("Mahavir Jayantiyear (latent)", -6.089044875446846),
-                                    ("Navaratriin|during <named-month>|year", -6.494509983555011),
-                                    ("Wednesdaythis|last|next <cycle>", -6.494509983555011),
-                                    ("Lentyear (latent)", -6.494509983555011),
+                                     -6.486922693742851),
+                                    ("today<time-of-day> am|pm", -6.486922693742851),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.081457585634687),
+                                    ("at <time-of-day><time> <part-of-day>", -6.486922693742851),
+                                    ("<day-of-month> (ordinal)intersect", -6.081457585634687),
+                                    ("hourhour", -3.596550935846686),
+                                    ("Mahavir Jayantiyear (latent)", -6.081457585634687),
+                                    ("Navaratriin|during <named-month>|year", -6.486922693742851),
+                                    ("Wednesdaythis|last|next <cycle>", -6.486922693742851),
+                                    ("Lentyear (latent)", -6.486922693742851),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.622707806653419),
-                                    ("Boghiyear (latent)", -6.494509983555011),
-                                    ("dayyear", -1.904453435376967),
+                                     -4.61512051684126),
+                                    ("Boghiyear (latent)", -6.486922693742851),
+                                    ("dayyear", -1.8968661455648077),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.494509983555011),
-                                    ("Thursdayfrom|since|after <time>", -6.089044875446846),
+                                     -6.486922693742851),
+                                    ("Thursdayfrom|since|after <time>", -6.081457585634687),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.494509983555011),
-                                    ("Thursdayat <time-of-day>", -5.801362802995065),
-                                    ("Islamic New Yearyear (latent)", -6.089044875446846),
-                                    ("Laylat al-Qadryear (latent)", -5.5782192516808555),
-                                    ("part of days<time-of-day> am|pm", -6.494509983555011),
-                                    ("Shrove Tuesdayyear (latent)", -6.494509983555011),
+                                     -6.486922693742851),
+                                    ("Thursdayat <time-of-day>", -5.793775513182905),
+                                    ("Islamic New Yearyear (latent)", -6.081457585634687),
+                                    ("Laylat al-Qadryear (latent)", -5.5706319618686955),
+                                    ("part of days<time-of-day> am|pm", -6.486922693742851),
+                                    ("Shrove Tuesdayyear (latent)", -6.486922693742851),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.801362802995065),
-                                    ("hourminute", -6.089044875446846),
-                                    ("<time-of-day> am|pmtomorrow", -5.801362802995065),
-                                    ("Yom Kippuryear (latent)", -6.494509983555011),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.089044875446846),
-                                    ("<part-of-day> of <time>year (latent)", -6.494509983555011),
-                                    ("minutehour", -5.241747015059643),
-                                    ("Kaanum Pongalyear (latent)", -6.089044875446846),
-                                    ("Maha Saptamiyear (latent)", -6.494509983555011),
+                                     -5.793775513182905),
+                                    ("hourminute", -6.081457585634687),
+                                    ("<time-of-day> am|pmtomorrow", -5.793775513182905),
+                                    ("Yom Kippuryear (latent)", -6.486922693742851),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.081457585634687),
+                                    ("<part-of-day> of <time>year (latent)", -6.486922693742851),
+                                    ("minutehour", -5.2341597252474825),
+                                    ("Kaanum Pongalyear (latent)", -6.081457585634687),
+                                    ("Maha Saptamiyear (latent)", -6.486922693742851),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.801362802995065),
-                                    ("time-of-day (latent)tomorrow", -5.5782192516808555),
-                                    ("part of daysat <time-of-day>", -4.88507207112091),
+                                     -5.793775513182905),
+                                    ("time-of-day (latent)tomorrow", -5.5706319618686955),
+                                    ("part of daysat <time-of-day>", -4.87748478130875),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.4796069630127455),
-                                    ("for <duration> from <time>December", -6.494509983555011),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.494509983555011),
+                                     -4.472019673200586),
+                                    ("for <duration> from <time>December", -6.486922693742851),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.486922693742851),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.241747015059643),
+                                     -5.2341597252474825),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.241747015059643),
-                                    ("time-of-day (latent)this <part-of-day>", -6.494509983555011),
-                                    ("Pentecostyear (latent)", -6.494509983555011),
+                                     -5.2341597252474825),
+                                    ("time-of-day (latent)this <part-of-day>", -6.486922693742851),
+                                    ("Pentecostyear (latent)", -6.486922693742851),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.241747015059643),
-                                    ("<day-of-month> (ordinal)February", -6.494509983555011),
-                                    ("Eid al-Fitryear (latent)", -5.10821562243512),
+                                     -5.2341597252474825),
+                                    ("<day-of-month> (ordinal)February", -6.486922693742851),
+                                    ("Eid al-Fitryear (latent)", -5.100628332622961),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.494509983555011),
-                                    ("Mondayin|during the <part-of-day>", -6.494509983555011),
-                                    ("Chhathin|during <named-month>|year", -6.494509983555011),
-                                    ("Diwaliin|during <named-month>|year", -6.494509983555011),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.494509983555011),
-                                    ("Vaisakhiin|during <named-month>|year", -6.494509983555011),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.241747015059643),
-                                    ("Raksha Bandhanyear (latent)", -6.494509983555011),
-                                    ("daysecond", -6.089044875446846),
+                                     -6.486922693742851),
+                                    ("Mondayin|during the <part-of-day>", -6.486922693742851),
+                                    ("Chhathin|during <named-month>|year", -6.486922693742851),
+                                    ("Diwaliin|during <named-month>|year", -6.486922693742851),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.486922693742851),
+                                    ("Vaisakhiin|during <named-month>|year", -6.486922693742851),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.2341597252474825),
+                                    ("Raksha Bandhanyear (latent)", -6.486922693742851),
+                                    ("daysecond", -6.081457585634687),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.089044875446846),
-                                    ("Ratha-Yatrayear (latent)", -6.494509983555011),
-                                    ("Ashurayear (latent)", -6.494509983555011),
-                                    ("Tuesdayin|during <named-month>|year", -6.494509983555011),
-                                    ("Chinese New Yearyear (latent)", -6.494509983555011),
-                                    ("tomorrowintersect", -6.494509983555011),
-                                    ("Lag BaOmeryear (latent)", -6.494509983555011),
+                                     -6.081457585634687),
+                                    ("Ratha-Yatrayear (latent)", -6.486922693742851),
+                                    ("Ashurayear (latent)", -6.486922693742851),
+                                    ("Tuesdayin|during <named-month>|year", -6.486922693742851),
+                                    ("Chinese New Yearyear (latent)", -6.486922693742851),
+                                    ("tomorrowintersect", -6.486922693742851),
+                                    ("Lag BaOmeryear (latent)", -6.486922693742851),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.494509983555011),
-                                    ("Eid al-Adhayear (latent)", -4.35444382005874),
-                                    ("intersectin|during the <part-of-day>", -6.494509983555011),
-                                    ("Palm Sundayyear (latent)", -6.494509983555011),
-                                    ("Christmasat <time-of-day>", -6.494509983555011),
-                                    ("Passoveryear (latent)", -6.494509983555011),
-                                    ("Lazarus Saturdayyear (latent)", -6.494509983555011),
+                                     -6.486922693742851),
+                                    ("Eid al-Adhayear (latent)", -4.34685653024658),
+                                    ("intersectin|during the <part-of-day>", -6.486922693742851),
+                                    ("Palm Sundayyear (latent)", -6.486922693742851),
+                                    ("Christmasat <time-of-day>", -6.486922693742851),
+                                    ("Passoveryear (latent)", -6.486922693742851),
+                                    ("Lazarus Saturdayyear (latent)", -6.486922693742851),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.494509983555011),
-                                    ("hhhmmon <day>", -5.5782192516808555),
-                                    ("Yom HaShoahyear (latent)", -6.089044875446846),
+                                     -6.486922693742851),
+                                    ("hhhmmon <day>", -5.5706319618686955),
+                                    ("Yom HaShoahyear (latent)", -6.081457585634687),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.089044875446846),
+                                     -6.081457585634687),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.494509983555011),
-                                    ("Septemberyear (latent)", -6.089044875446846),
+                                     -6.486922693742851),
+                                    ("Septemberyear (latent)", -6.081457585634687),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.990432586778736),
-                                    ("Halloweenyear (latent)", -6.494509983555011),
+                                     -4.982845296966577),
+                                    ("Halloweenyear (latent)", -6.486922693742851),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.089044875446846),
+                                     -6.081457585634687),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.801362802995065),
+                                     -5.793775513182905),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.494509983555011),
-                                    ("at <time-of-day>intersect", -5.5782192516808555),
-                                    ("Rosh Hashanahyear (latent)", -5.801362802995065),
-                                    ("Dhanterasyear (latent)", -6.494509983555011),
-                                    ("Tu BiShvatyear (latent)", -6.494509983555011),
-                                    ("<day-of-month> (ordinal)December", -5.801362802995065),
-                                    ("Holiyear (latent)", -5.801362802995065),
+                                     -6.486922693742851),
+                                    ("at <time-of-day>intersect", -5.5706319618686955),
+                                    ("Rosh Hashanahyear (latent)", -5.793775513182905),
+                                    ("Dhanterasyear (latent)", -6.486922693742851),
+                                    ("Tu BiShvatyear (latent)", -6.486922693742851),
+                                    ("<day-of-month> (ordinal)December", -5.793775513182905),
+                                    ("Holiyear (latent)", -5.793775513182905),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.494509983555011),
-                                    ("Holika Dahanyear (latent)", -5.801362802995065),
+                                     -6.486922693742851),
+                                    ("Holika Dahanyear (latent)", -5.793775513182905),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.089044875446846),
-                                    ("dayminute", -3.1446058962804053),
-                                    ("Mawlidyear (latent)", -6.494509983555011),
+                                     -6.081457585634687),
+                                    ("dayminute", -3.137018606468246),
+                                    ("Mawlidyear (latent)", -6.486922693742851),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.089044875446846),
+                                     -6.081457585634687),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.494509983555011),
-                                    ("Jumu'atul-Widayear (latent)", -5.5782192516808555),
-                                    ("minuteday", -2.6878474937846906),
+                                     -6.486922693742851),
+                                    ("Jumu'atul-Widayear (latent)", -5.5706319618686955),
+                                    ("minuteday", -2.7492530754594826),
                                     ("absorption of , after named dayintersect",
-                                     -5.801362802995065),
-                                    ("intersectyear (latent)", -6.494509983555011),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.494509983555011),
+                                     -5.793775513182905),
+                                    ("intersectyear (latent)", -6.486922693742851),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.486922693742851),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.494509983555011),
+                                     -6.486922693742851),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.494509983555011),
-                                    ("intersecthhhmm", -6.089044875446846),
+                                     -6.486922693742851),
+                                    ("intersecthhhmm", -6.081457585634687),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.494509983555011),
-                                    ("Mothering Sundayyear (latent)", -6.089044875446846),
-                                    ("Boss's Dayyear (latent)", -6.089044875446846),
+                                     -6.486922693742851),
+                                    ("Mothering Sundayyear (latent)", -6.081457585634687),
+                                    ("Boss's Dayyear (latent)", -6.081457585634687),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.494509983555011),
-                                    ("Global Youth Service Dayyear (latent)", -6.494509983555011),
-                                    ("Dhanterasin|during <named-month>|year", -6.494509983555011),
-                                    ("Tisha B'Avyear (latent)", -6.494509983555011),
-                                    ("Isra and Mi'rajyear (latent)", -5.5782192516808555),
-                                    ("at <time-of-day>on <day>", -4.88507207112091),
+                                     -6.486922693742851),
+                                    ("Global Youth Service Dayyear (latent)", -6.486922693742851),
+                                    ("Dhanterasin|during <named-month>|year", -6.486922693742851),
+                                    ("Tisha B'Avyear (latent)", -6.486922693742851),
+                                    ("Isra and Mi'rajyear (latent)", -5.5706319618686955),
+                                    ("at <time-of-day>on <day>", -4.87748478130875),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.089044875446846),
+                                     -6.081457585634687),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.801362802995065),
-                                    ("Christmasyear (latent)", -6.089044875446846),
-                                    ("Saturdayintersect", -6.494509983555011),
-                                    ("Naraka Chaturdashiyear (latent)", -6.089044875446846),
-                                    ("Thai Pongalin|during <named-month>|year", -6.494509983555011),
-                                    ("dayweek", -6.494509983555011),
-                                    ("Easter Sundayyear (latent)", -5.801362802995065),
+                                     -5.793775513182905),
+                                    ("Christmasyear (latent)", -6.081457585634687),
+                                    ("Saturdayintersect", -6.486922693742851),
+                                    ("Naraka Chaturdashiyear (latent)", -6.081457585634687),
+                                    ("Thai Pongalin|during <named-month>|year", -6.486922693742851),
+                                    ("dayweek", -6.486922693742851),
+                                    ("Easter Sundayyear (latent)", -5.793775513182905),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.395897694886901),
-                                    ("weekyear", -5.395897694886901),
-                                    ("King's Dayyear (latent)", -4.990432586778736),
-                                    ("hh:mmin|during the <part-of-day>", -5.5782192516808555),
+                                     -6.081457585634687),
+                                    ("weekyear", -5.3883104050747415),
+                                    ("King's Dayyear (latent)", -4.982845296966577),
+                                    ("hh:mmin|during the <part-of-day>", -5.5706319618686955),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.089044875446846),
-                                    ("Hanukkahyear (latent)", -5.801362802995065),
-                                    ("Rama Navamiyear (latent)", -6.494509983555011),
-                                    ("February<time> <part-of-day>", -6.494509983555011),
+                                     -6.081457585634687),
+                                    ("Hanukkahyear (latent)", -5.793775513182905),
+                                    ("Rama Navamiyear (latent)", -6.486922693742851),
+                                    ("February<time> <part-of-day>", -6.486922693742851),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.801362802995065),
-                                    ("Great Lentyear (latent)", -6.494509983555011),
-                                    ("tomorrowat <time-of-day>", -5.801362802995065),
+                                     -5.793775513182905),
+                                    ("Great Lentyear (latent)", -6.486922693742851),
+                                    ("tomorrowat <time-of-day>", -5.793775513182905),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.494509983555011),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.089044875446846),
-                                    ("Ugadiyear (latent)", -5.10821562243512),
-                                    ("Vaisakhiyear (latent)", -5.801362802995065),
+                                     -6.486922693742851),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.081457585634687),
+                                    ("Ugadiyear (latent)", -5.100628332622961),
+                                    ("Vaisakhiyear (latent)", -5.793775513182905),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.801362802995065),
-                                    ("last <cycle> of <time>year (latent)", -5.801362802995065),
-                                    ("at <time-of-day>tomorrow", -6.089044875446846),
-                                    ("tomorrow<time-of-day> am|pm", -6.494509983555011),
+                                     -5.793775513182905),
+                                    ("last <cycle> of <time>year (latent)", -5.793775513182905),
+                                    ("at <time-of-day>tomorrow", -6.081457585634687),
+                                    ("tomorrow<time-of-day> am|pm", -6.486922693742851),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.494509983555011),
-                                    ("Diwaliyear (latent)", -6.494509983555011),
-                                    ("between <time> and <time>on <day>", -5.395897694886901),
-                                    ("Black Fridayyear (latent)", -6.089044875446846),
+                                     -6.486922693742851),
+                                    ("Diwaliyear (latent)", -6.486922693742851),
+                                    ("between <time> and <time>on <day>", -6.081457585634687),
+                                    ("Black Fridayyear (latent)", -6.081457585634687),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.494509983555011),
+                                     -6.486922693742851),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.494509983555011),
-                                    ("Chhathyear (latent)", -6.089044875446846),
-                                    ("Vasant Panchamiyear (latent)", -6.494509983555011),
-                                    ("Rabindra Jayantiyear (latent)", -5.241747015059643),
-                                    ("this <part-of-day>at <time-of-day>", -5.241747015059643),
-                                    ("St Patrick's Dayyear (latent)", -6.494509983555011),
-                                    ("Thursday<time> (timezone)", -6.494509983555011),
+                                     -6.486922693742851),
+                                    ("Chhathyear (latent)", -6.081457585634687),
+                                    ("Vasant Panchamiyear (latent)", -6.486922693742851),
+                                    ("Rabindra Jayantiyear (latent)", -5.2341597252474825),
+                                    ("this <part-of-day>at <time-of-day>", -5.2341597252474825),
+                                    ("St Patrick's Dayyear (latent)", -6.486922693742851),
+                                    ("Thursday<time> (timezone)", -6.486922693742851),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.494509983555011),
-                                    ("Pargat Diwasyear (latent)", -5.241747015059643),
-                                    ("August Bank Holidayyear (latent)", -5.801362802995065),
-                                    ("<datetime> - <datetime> (interval)July", -6.089044875446846),
+                                     -6.486922693742851),
+                                    ("Pargat Diwasyear (latent)", -5.2341597252474825),
+                                    ("August Bank Holidayyear (latent)", -5.793775513182905),
+                                    ("<datetime> - <datetime> (interval)July", -6.081457585634687),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.801362802995065),
-                                    ("Februaryintersect", -6.494509983555011),
-                                    ("Simchat Torahyear (latent)", -6.494509983555011),
-                                    ("minuteyear", -6.494509983555011)],
-                               n = 510},
+                                     -5.793775513182905),
+                                    ("Februaryintersect", -6.486922693742851),
+                                    ("Simchat Torahyear (latent)", -6.486922693742851),
+                                    ("minuteyear", -6.486922693742851)],
+                               n = 504},
                    koData =
-                     ClassData{prior = -0.9869983040384415, unseen = -6.813444599510896,
+                     ClassData{prior = -0.9775343571148737, unseen = -6.81783057145415,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.61512051684126),
+                                   [("Thursdayhhhmm", -4.619511303258749),
                                     ("time-of-day (latent)<time-of-day> - <time-of-day> (interval)",
-                                     -5.713732805509369),
-                                    ("hourday", -3.5934692693092782),
+                                     -5.718123591926859),
+                                    ("hourday", -3.7256934272366524),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.119197913617533),
-                                    ("<day-of-month> (ordinal)August", -6.119197913617533),
-                                    ("dayhour", -3.4450492641910047),
-                                    ("<time> timezoneyear (latent)", -5.426050733057588),
+                                     -6.1235887000350235),
+                                    ("<day-of-month> (ordinal)August", -6.1235887000350235),
+                                    ("dayhour", -3.4494400506084943),
+                                    ("<time> timezoneyear (latent)", -5.430441519475078),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.202907181743378),
-                                    ("Tuesdayfrom|since|after <time>", -5.426050733057588),
-                                    ("daymonth", -3.4450492641910047),
-                                    ("monthyear", -4.866434945122165),
-                                    ("<time-of-day> am|pmyear (latent)", -5.426050733057588),
-                                    ("Thai Pongalyear (latent)", -5.426050733057588),
-                                    ("intersecthh:mm", -6.119197913617533),
+                                     -5.207297968160868),
+                                    ("Tuesdayfrom|since|after <time>", -5.430441519475078),
+                                    ("daymonth", -3.4494400506084943),
+                                    ("monthyear", -4.8708257315396555),
+                                    ("<time-of-day> am|pmyear (latent)", -5.430441519475078),
+                                    ("Thai Pongalyear (latent)", -5.430441519475078),
+                                    ("intersecthh:mm", -6.1235887000350235),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.713732805509369),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.119197913617533),
-                                    ("houryear", -4.732903552497643),
+                                     -5.718123591926859),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.1235887000350235),
+                                    ("houryear", -4.737294338915133),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.119197913617533),
-                                    ("<day-of-month> (ordinal)October", -6.119197913617533),
+                                     -6.1235887000350235),
+                                    ("<day-of-month> (ordinal)October", -6.1235887000350235),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.426050733057588),
-                                    ("hournograin", -4.866434945122165),
-                                    ("<time-of-day> am|pmintersect", -4.866434945122165),
-                                    ("Octoberyear (latent)", -6.119197913617533),
+                                     -5.430441519475078),
+                                    ("hournograin", -4.8708257315396555),
+                                    ("<time-of-day> am|pmintersect", -4.8708257315396555),
+                                    ("Octoberyear (latent)", -6.1235887000350235),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.713732805509369),
-                                    ("early morningat <time-of-day>", -6.119197913617533),
-                                    ("until <time>on <day>", -5.426050733057588),
+                                     -5.718123591926859),
+                                    ("early morningat <time-of-day>", -6.1235887000350235),
+                                    ("until <time>on <day>", -5.430441519475078),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.119197913617533),
-                                    ("time-of-day (latent)intersect", -5.426050733057588),
-                                    ("todayin <number> (implicit minutes)", -6.119197913617533),
+                                     -6.1235887000350235),
+                                    ("time-of-day (latent)intersect", -5.430441519475078),
+                                    ("todayin <number> (implicit minutes)", -6.1235887000350235),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.426050733057588),
+                                     -5.430441519475078),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.119197913617533),
+                                     -6.1235887000350235),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.119197913617533),
-                                    ("hh:mmon <day>", -4.509760001183433),
-                                    ("hhhmmintersect", -5.713732805509369),
-                                    ("absorption of , after named dayJuly", -5.202907181743378),
-                                    ("from|since|after <time>July", -5.713732805509369),
+                                     -6.1235887000350235),
+                                    ("hh:mmon <day>", -4.8708257315396555),
+                                    ("hhhmmintersect", -5.718123591926859),
+                                    ("absorption of , after named dayJuly", -5.207297968160868),
+                                    ("from|since|after <time>July", -5.718123591926859),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.202907181743378),
-                                    ("Clean Mondayyear (latent)", -6.119197913617533),
-                                    ("monthhour", -6.119197913617533),
+                                     -5.207297968160868),
+                                    ("Clean Mondayyear (latent)", -6.1235887000350235),
+                                    ("monthhour", -6.1235887000350235),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.713732805509369),
-                                    ("hourmonth", -4.247395736715942),
-                                    ("todayat <time-of-day>", -6.119197913617533),
-                                    ("Bank Holidayyear (latent)", -5.426050733057588),
-                                    ("hhhmmyear (latent)", -4.866434945122165),
-                                    ("from|since|after <time>December", -6.119197913617533),
+                                     -5.718123591926859),
+                                    ("hourmonth", -4.251786523133432),
+                                    ("todayat <time-of-day>", -6.1235887000350235),
+                                    ("Bank Holidayyear (latent)", -5.430441519475078),
+                                    ("hhhmmyear (latent)", -4.8708257315396555),
+                                    ("from|since|after <time>December", -6.1235887000350235),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.119197913617533),
-                                    ("<time-of-day> am|pmon <day>", -4.866434945122165),
-                                    ("Mondayyear (latent)", -5.426050733057588),
-                                    ("dayday", -4.732903552497643),
-                                    ("dd/mmat <time-of-day>", -5.713732805509369),
-                                    ("on <day>September", -5.426050733057588),
-                                    ("time-of-day (latent)September", -5.713732805509369),
-                                    ("hourhour", -3.8679061150110385),
-                                    ("time-of-day (latent)on <day>", -4.327438444389479),
-                                    ("Thursdaydd/mm", -6.119197913617533),
+                                     -6.1235887000350235),
+                                    ("<time-of-day> am|pmon <day>", -4.8708257315396555),
+                                    ("Mondayyear (latent)", -5.430441519475078),
+                                    ("dayday", -4.108685679492758),
+                                    ("dd/mmat <time-of-day>", -5.718123591926859),
+                                    ("on <day>September", -5.430441519475078),
+                                    ("time-of-day (latent)September", -5.718123591926859),
+                                    ("hourhour", -3.872296901428528),
+                                    ("time-of-day (latent)on <day>", -4.619511303258749),
+                                    ("Thursdaydd/mm", -6.1235887000350235),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.713732805509369),
-                                    ("dayyear", -3.098773027473171),
-                                    ("New Year's Dayyear (latent)", -5.202907181743378),
-                                    ("time-of-day (latent)Sunday", -5.713732805509369),
-                                    ("Thursdayfrom|since|after <time>", -4.414449821379108),
-                                    ("Thursdayat <time-of-day>", -4.509760001183433),
+                                     -5.718123591926859),
+                                    ("dayyear", -3.1031638138906605),
+                                    ("New Year's Dayyear (latent)", -5.207297968160868),
+                                    ("time-of-day (latent)Sunday", -5.718123591926859),
+                                    ("Thursdayfrom|since|after <time>", -4.418840607796598),
+                                    ("Thursdayat <time-of-day>", -4.514150787600923),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.119197913617533),
-                                    ("Aprilyear (latent)", -6.119197913617533),
-                                    ("the <day-of-month> (ordinal)July", -6.119197913617533),
-                                    ("the <day-of-month> (number)July", -6.119197913617533),
-                                    ("monthminute", -6.119197913617533),
-                                    ("hourminute", -5.426050733057588),
-                                    ("<time-of-day> am|pmtomorrow", -6.119197913617533),
-                                    ("Thursdayhh:mm", -5.202907181743378),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.713732805509369),
-                                    ("minutemonth", -3.9791317501212626),
-                                    ("time-of-day (latent)Friday", -5.713732805509369),
-                                    ("minutehour", -6.119197913617533),
-                                    ("part of daysat <time-of-day>", -5.020585624949423),
-                                    ("Augustyear (latent)", -5.713732805509369),
-                                    ("week-endin|during <named-month>|year", -6.119197913617533),
-                                    ("time-of-day (latent)Tuesday", -5.713732805509369),
+                                     -6.1235887000350235),
+                                    ("Aprilyear (latent)", -6.1235887000350235),
+                                    ("the <day-of-month> (ordinal)July", -6.1235887000350235),
+                                    ("the <day-of-month> (number)July", -6.1235887000350235),
+                                    ("monthminute", -6.1235887000350235),
+                                    ("hourminute", -5.430441519475078),
+                                    ("<time-of-day> am|pmtomorrow", -6.1235887000350235),
+                                    ("Thursdayhh:mm", -5.207297968160868),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.718123591926859),
+                                    ("minutemonth", -3.9835225365387523),
+                                    ("time-of-day (latent)Friday", -5.718123591926859),
+                                    ("minutehour", -6.1235887000350235),
+                                    ("part of daysat <time-of-day>", -5.0249764113669135),
+                                    ("Augustyear (latent)", -5.718123591926859),
+                                    ("week-endin|during <named-month>|year", -6.1235887000350235),
+                                    ("time-of-day (latent)Tuesday", -5.718123591926859),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.119197913617533),
+                                     -6.1235887000350235),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.119197913617533),
+                                     -6.1235887000350235),
                                     ("dd/mm<time-of-day> - <time-of-day> (interval)",
-                                     -5.713732805509369),
-                                    ("Sundayyear (latent)", -5.202907181743378),
-                                    ("Christmasat <time-of-day>", -6.119197913617533),
-                                    ("from|since|after <time>year (latent)", -5.020585624949423),
-                                    ("dd/mmyear (latent)", -6.119197913617533),
-                                    ("hhhmmon <day>", -5.202907181743378),
-                                    ("yesterday<time-of-day> am|pm", -6.119197913617533),
-                                    ("<day-of-month> (ordinal)July", -5.426050733057588),
+                                     -5.718123591926859),
+                                    ("Sundayyear (latent)", -5.207297968160868),
+                                    ("the <day-of-month> (ordinal)Monday", -5.430441519475078),
+                                    ("Christmasat <time-of-day>", -6.1235887000350235),
+                                    ("from|since|after <time>year (latent)", -5.0249764113669135),
+                                    ("dd/mmyear (latent)", -6.1235887000350235),
+                                    ("hhhmmon <day>", -5.207297968160868),
+                                    ("yesterday<time-of-day> am|pm", -6.1235887000350235),
+                                    ("<day-of-month> (ordinal)July", -5.430441519475078),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.119197913617533),
+                                     -6.1235887000350235),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.119197913617533),
+                                     -6.1235887000350235),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.119197913617533),
-                                    ("at <time-of-day>intersect", -5.202907181743378),
-                                    ("hh:mmyear (latent)", -4.732903552497643),
-                                    ("Holiyear (latent)", -6.119197913617533),
-                                    ("until <time><time-of-day> am|pm", -6.119197913617533),
+                                     -6.1235887000350235),
+                                    ("at <time-of-day>intersect", -5.207297968160868),
+                                    ("hh:mmyear (latent)", -4.737294338915133),
+                                    ("Holiyear (latent)", -6.1235887000350235),
+                                    ("until <time><time-of-day> am|pm", -6.1235887000350235),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.713732805509369),
-                                    ("dayminute", -3.2569970326880653),
-                                    ("yyyy-mm-ddhh:mm", -5.713732805509369),
-                                    ("intersectfrom|since|after <time>", -5.713732805509369),
-                                    ("intersectSeptember", -4.247395736715942),
-                                    ("minuteday", -2.900322088749333),
+                                     -5.718123591926859),
+                                    ("dayminute", -3.261387819105555),
+                                    ("yyyy-mm-ddhh:mm", -5.718123591926859),
+                                    ("intersectfrom|since|after <time>", -5.718123591926859),
+                                    ("intersectSeptember", -4.251786523133432),
+                                    ("minuteday", -2.96658827888491),
                                     ("absorption of , after named dayintersect",
-                                     -6.119197913617533),
-                                    ("intersectyear (latent)", -6.119197913617533),
-                                    ("Februaryin|during the <part-of-day>", -6.119197913617533),
+                                     -6.1235887000350235),
+                                    ("intersectyear (latent)", -6.1235887000350235),
+                                    ("Februaryin|during the <part-of-day>", -6.1235887000350235),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.119197913617533),
-                                    ("time-of-day (latent)July", -5.426050733057588),
-                                    ("Saturdayyear (latent)", -6.119197913617533),
+                                     -6.1235887000350235),
+                                    ("time-of-day (latent)July", -5.430441519475078),
+                                    ("Saturdayyear (latent)", -6.1235887000350235),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.119197913617533),
-                                    ("at <time-of-day>on <day>", -5.202907181743378),
-                                    ("time-of-day (latent)<time-of-day> am|pm", -6.119197913617533),
+                                     -6.1235887000350235),
+                                    ("<day-of-month> (ordinal)Monday", -5.207297968160868),
+                                    ("at <time-of-day>on <day>", -5.207297968160868),
+                                    ("time-of-day (latent)<time-of-day> am|pm",
+                                     -6.1235887000350235),
                                     ("absorption of , after named daySeptember",
-                                     -4.866434945122165),
-                                    ("Naraka Chaturdashiyear (latent)", -6.119197913617533),
-                                    ("from|since|after <time>on <day>", -5.202907181743378),
-                                    ("dayweek", -6.119197913617533),
-                                    ("Easter Sundayyear (latent)", -5.713732805509369),
-                                    ("time-of-day (latent)at <time-of-day>", -5.426050733057588),
-                                    ("Thursday<time-of-day> am|pm", -4.866434945122165),
-                                    ("weekyear", -5.713732805509369),
-                                    ("time-of-day (latent)Thursday", -5.713732805509369),
+                                     -4.8708257315396555),
+                                    ("Naraka Chaturdashiyear (latent)", -6.1235887000350235),
+                                    ("from|since|after <time>on <day>", -5.207297968160868),
+                                    ("dayweek", -6.1235887000350235),
+                                    ("Easter Sundayyear (latent)", -5.718123591926859),
+                                    ("time-of-day (latent)at <time-of-day>", -5.430441519475078),
+                                    ("Thursday<time-of-day> am|pm", -4.8708257315396555),
+                                    ("weekyear", -5.718123591926859),
+                                    ("time-of-day (latent)Thursday", -5.718123591926859),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.119197913617533),
-                                    ("<day-of-month> (ordinal)April", -6.119197913617533),
+                                     -6.1235887000350235),
+                                    ("<day-of-month> (ordinal)April", -6.1235887000350235),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.713732805509369),
+                                     -5.718123591926859),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.426050733057588),
-                                    ("Sundayfrom|since|after <time>", -6.119197913617533),
-                                    ("absorption of , after named dayFebruary", -5.202907181743378),
+                                     -5.430441519475078),
+                                    ("Sundayfrom|since|after <time>", -6.1235887000350235),
+                                    ("absorption of , after named dayFebruary", -5.207297968160868),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.713732805509369),
+                                     -5.718123591926859),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.119197913617533),
-                                    ("tomorrowat <time-of-day>", -6.119197913617533),
-                                    ("daynograin", -5.713732805509369),
+                                     -6.1235887000350235),
+                                    ("tomorrowat <time-of-day>", -6.1235887000350235),
+                                    ("daynograin", -5.718123591926859),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.713732805509369),
-                                    ("last <cycle> of <time>year (latent)", -5.713732805509369),
-                                    ("tomorrow<time-of-day> am|pm", -6.119197913617533),
+                                     -5.718123591926859),
+                                    ("last <cycle> of <time>year (latent)", -5.718123591926859),
+                                    ("tomorrow<time-of-day> am|pm", -6.1235887000350235),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.426050733057588),
-                                    ("Diwaliyear (latent)", -5.713732805509369),
+                                     -5.430441519475078),
+                                    ("Diwaliyear (latent)", -5.718123591926859),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.119197913617533),
-                                    ("this <part-of-day>at <time-of-day>", -5.202907181743378),
-                                    ("Fridayyear (latent)", -5.713732805509369),
-                                    ("time-of-day (latent)April", -6.119197913617533),
-                                    ("minuteyear", -3.9219733362813143)],
-                               n = 303}}),
+                                     -6.1235887000350235),
+                                    ("this <part-of-day>at <time-of-day>", -5.207297968160868),
+                                    ("Fridayyear (latent)", -5.718123591926859),
+                                    ("time-of-day (latent)April", -6.1235887000350235),
+                                    ("minuteyear", -3.9263641226988035)],
+                               n = 304}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1456,8 +1474,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.332204510175204,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 26},
+                     ClassData{prior = 0.0, unseen = -3.4657359027997265,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 30},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1738,10 +1756,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1821,27 +1839,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1912,12 +1931,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2127,28 +2146,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15790302944580878,
-                               unseen = -5.093750200806762,
+                     ClassData{prior = -0.23947997063390317,
+                               unseen = -5.209486152841421,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.1173044216802621),
-                                    ("month (grain)", -2.7850112422383386),
-                                    ("year (grain)", -2.6026896854443837),
-                                    ("week (grain)", -1.1173044216802621),
-                                    ("quarter", -3.4781584227982836), ("year", -2.6026896854443837),
-                                    ("month", -2.7850112422383386),
-                                    ("quarter (grain)", -3.4781584227982836)],
-                               n = 76},
+                                   [("week", -1.2337147735246734),
+                                    ("month (grain)", -2.495956485974585),
+                                    ("year (grain)", -2.431417964837014),
+                                    ("week (grain)", -1.2337147735246734),
+                                    ("quarter", -3.594568774642695), ("year", -2.431417964837014),
+                                    ("month", -2.495956485974585),
+                                    ("quarter (grain)", -3.594568774642695)],
+                               n = 85},
                    koData =
-                     ClassData{prior = -1.9236870122706031,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.54663701119507, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2233,7 +2255,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2241,14 +2264,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2348,19 +2371,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6523251860396901, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6270073780554003, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7357067949787413, unseen = -4.770684624465665,
+                     ClassData{prior = -0.7639732331285577, unseen = -4.718498871295094,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.08260525686124e-2),
-                                    ("integer (0..19)", -2.68273239311792)],
-                               n = 115}}),
+                                   [("integer (numeric)", -7.480121308269841e-2),
+                                    ("integer (0..19)", -2.630088659632498)],
+                               n = 109}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2492,21 +2515,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.1941560144409575, unseen = -4.189654742026425,
+                     ClassData{prior = -0.21511137961694557, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6894806201076367),
-                                    ("dd/mm", -3.481240089335692),
-                                    ("absorption of , after named day", -2.7880929087757464),
-                                    ("intersect", -2.7880929087757464),
-                                    ("Saturday", -2.7880929087757464),
-                                    ("Friday", -3.0757749812275272), ("day", -0.807091439909163),
-                                    ("the <day-of-month> (ordinal)", -3.0757749812275272),
+                                   [("Thursday", -1.8803128665695), ("dd/mm", -3.3843902633457743),
+                                    ("absorption of , after named day", -2.691243082785829),
+                                    ("intersect", -2.691243082785829),
+                                    ("Saturday", -2.691243082785829),
+                                    ("Friday", -2.9789251552376097), ("day", -0.8194409058842375),
+                                    ("the <day-of-month> (ordinal)", -2.9789251552376097),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.7880929087757464)],
-                               n = 28},
+                                     -2.691243082785829)],
+                               n = 25},
                    koData =
-                     ClassData{prior = -1.7346010553881064,
+                     ClassData{prior = -1.6422277352570913,
                                unseen = -3.0910424533583156,
                                likelihoods =
                                  HashMap.fromList
@@ -2589,15 +2611,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2621,11 +2649,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11191791620398532,
-                               unseen = -4.356708826689592,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 76},
+                     ClassData{prior = -0.12095261041766256,
+                               unseen = -4.276666119016055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 70},
                    koData =
-                     ClassData{prior = -2.245426679154097, unseen = -2.3978952727983707,
+                     ClassData{prior = -2.172223275130802, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2670,18 +2698,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2862,67 +2892,67 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5926766501963108, unseen = -5.327876168789581,
+                     ClassData{prior = -0.579818495252942, unseen = -5.3471075307174685,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.629862798578463),
-                                    ("dayhour", -4.2243976904702984),
-                                    ("daymonth", -2.2784875414149854),
+                                     -4.6491870714048655),
+                                    ("dayhour", -4.243721963296701),
+                                    ("daymonth", -2.2068400360356613),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.629862798578463),
+                                     -4.6491870714048655),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.377099830083095),
-                                    ("Wednesdayintersect", -4.629862798578463),
+                                     -3.3964241029094975),
+                                    ("Wednesdayintersect", -4.6491870714048655),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.2435684374585723),
-                                    ("Black Fridaythis|last|next <cycle>", -4.629862798578463),
-                                    ("<part-of-day> of <time>February", -4.629862798578463),
-                                    ("Saturday<time-of-day> am|pm", -4.629862798578463),
+                                     -3.262892710284975),
+                                    ("Black Fridaythis|last|next <cycle>", -4.6491870714048655),
+                                    ("<part-of-day> of <time>February", -4.6491870714048655),
+                                    ("Saturday<time-of-day> am|pm", -4.6491870714048655),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.2243976904702984),
-                                    ("hourmonth", -4.629862798578463),
+                                     -4.243721963296701),
+                                    ("hourmonth", -4.6491870714048655),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9367156180185177),
-                                    ("dayday", -2.3785709999719677),
-                                    ("the <day-of-month> (ordinal)February", -4.2243976904702984),
-                                    ("WednesdayOctober", -4.629862798578463),
-                                    ("Wednesdaythis|last|next <cycle>", -4.2243976904702984),
+                                     -3.9560398908449206),
+                                    ("dayday", -2.3978952727983707),
+                                    ("the <day-of-month> (ordinal)February", -4.243721963296701),
+                                    ("WednesdayOctober", -4.6491870714048655),
+                                    ("Wednesdaythis|last|next <cycle>", -4.243721963296701),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.377099830083095),
-                                    ("dayyear", -3.713572066704308),
+                                     -3.3964241029094975),
+                                    ("dayyear", -3.7328963395307104),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.629862798578463),
-                                    ("Thursdayhh:mm", -4.2243976904702984),
-                                    ("Thanksgiving Daythis|last|next <cycle>", -4.629862798578463),
-                                    ("TuesdayOctober", -4.629862798578463),
-                                    ("the <day-of-month> (ordinal)March", -4.629862798578463),
-                                    ("Mondaythis|last|next <cycle>", -4.629862798578463),
-                                    ("Fridayintersect", -3.9367156180185177),
+                                     -4.6491870714048655),
+                                    ("Thursdayhh:mm", -4.243721963296701),
+                                    ("Thanksgiving Daythis|last|next <cycle>", -4.6491870714048655),
+                                    ("TuesdayOctober", -4.6491870714048655),
+                                    ("the <day-of-month> (ordinal)March", -4.6491870714048655),
+                                    ("Mondaythis|last|next <cycle>", -3.9560398908449206),
+                                    ("Fridayintersect", -3.9560398908449206),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.2243976904702984),
-                                    ("intersectOctober", -4.2243976904702984),
+                                     -4.243721963296701),
+                                    ("intersectOctober", -4.243721963296701),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.713572066704308),
-                                    ("Tuesdaythis|last|next <cycle>", -4.629862798578463),
+                                     -3.7328963395307104),
+                                    ("Tuesdaythis|last|next <cycle>", -4.6491870714048655),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.629862798578463),
-                                    ("dayminute", -2.8381033293504077),
-                                    ("minuteday", -3.377099830083095),
-                                    ("this|last|next <cycle>Sunday", -4.629862798578463),
-                                    ("Sundaythis|last|next <cycle>", -4.629862798578463),
-                                    ("on <day><time-of-day> am|pm", -4.629862798578463),
-                                    ("intersectintersect", -4.629862798578463),
-                                    ("weekday", -4.629862798578463),
-                                    ("dayweek", -3.531250509910353),
+                                     -4.6491870714048655),
+                                    ("dayminute", -2.8574276021768106),
+                                    ("minuteday", -3.3964241029094975),
+                                    ("this|last|next <cycle>Sunday", -4.6491870714048655),
+                                    ("Sundaythis|last|next <cycle>", -4.6491870714048655),
+                                    ("on <day><time-of-day> am|pm", -4.6491870714048655),
+                                    ("intersectintersect", -4.6491870714048655),
+                                    ("weekday", -4.6491870714048655),
+                                    ("dayweek", -3.550574782736756),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.2243976904702984),
-                                    ("<datetime> - <datetime> (interval)July", -3.713572066704308),
+                                     -4.243721963296701),
+                                    ("<datetime> - <datetime> (interval)July", -3.7328963395307104),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9367156180185177)],
-                               n = 68},
+                                     -3.9560398908449206)],
+                               n = 70},
                    koData =
-                     ClassData{prior = -0.8048511701399466, unseen = -5.19295685089021,
+                     ClassData{prior = -0.8209805520698302, unseen = -5.19295685089021,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.4942386252808095),
@@ -3031,7 +3061,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -3040,14 +3070,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3248,14 +3277,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3748,31 +3777,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_IE.hs b/Duckling/Ranking/Classifiers/EN_IE.hs
index 25c86ef1..5894f633 100644
--- a/Duckling/Ranking/Classifiers/EN_IE.hs
+++ b/Duckling/Ranking/Classifiers/EN_IE.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
-                                    ("Thursdaydd/mm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
+                                    ("Thursdaydd/mm", -6.0787883752796565),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1701,10 +1718,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_IN.hs b/Duckling/Ranking/Classifiers/EN_IN.hs
index 6ff1f2e7..820f4d8a 100644
--- a/Duckling/Ranking/Classifiers/EN_IN.hs
+++ b/Duckling/Ranking/Classifiers/EN_IN.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
-                                    ("Thursdaydd/mm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
+                                    ("Thursdaydd/mm", -6.0787883752796565),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1701,10 +1718,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_JM.hs b/Duckling/Ranking/Classifiers/EN_JM.hs
index 94aff13f..4e01294f 100644
--- a/Duckling/Ranking/Classifiers/EN_JM.hs
+++ b/Duckling/Ranking/Classifiers/EN_JM.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
-                                    ("Thursdaydd/mm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
+                                    ("Thursdaydd/mm", -6.0787883752796565),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1701,10 +1718,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_NZ.hs b/Duckling/Ranking/Classifiers/EN_NZ.hs
index cc7e9373..08116402 100644
--- a/Duckling/Ranking/Classifiers/EN_NZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_NZ.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
-                                    ("Thursdaydd/mm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
+                                    ("Thursdaydd/mm", -6.0787883752796565),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1701,10 +1718,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_PH.hs b/Duckling/Ranking/Classifiers/EN_PH.hs
index c6ad9e35..3e0322ba 100644
--- a/Duckling/Ranking/Classifiers/EN_PH.hs
+++ b/Duckling/Ranking/Classifiers/EN_PH.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("Thursdaymm/dd", -6.074195944705447),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("Thursdaymm/dd", -6.0787883752796565),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1708,10 +1725,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("yesterday",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_TT.hs b/Duckling/Ranking/Classifiers/EN_TT.hs
index 43b4491f..c4e39342 100644
--- a/Duckling/Ranking/Classifiers/EN_TT.hs
+++ b/Duckling/Ranking/Classifiers/EN_TT.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
-                                    ("Thursdaydd/mm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
+                                    ("Thursdaydd/mm", -6.0787883752796565),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1701,10 +1718,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_US.hs b/Duckling/Ranking/Classifiers/EN_US.hs
index 2914161e..618b9943 100644
--- a/Duckling/Ranking/Classifiers/EN_US.hs
+++ b/Duckling/Ranking/Classifiers/EN_US.hs
@@ -81,19 +81,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5647660139117384, unseen = -6.214608098422191,
+                     ClassData{prior = -0.5509726917794028, unseen = -6.214608098422191,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 498},
                    koData =
-                     ClassData{prior = -0.8404718953168038, unseen = -5.940171252720432,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 378}}),
+                     ClassData{prior = -0.8589394354026894, unseen = -5.908082938168931,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 366}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -633,28 +634,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -693,11 +694,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -866,6 +868,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -955,473 +969,477 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.43903554765797803,
-                               unseen = -7.234177179749849,
+                     ClassData{prior = -0.44425113314332093,
+                               unseen = -7.226936018493289,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.540308238061494),
-                                    ("Father's Dayyear (latent)", -6.540308238061494),
-                                    ("Karva Chauthyear (latent)", -6.540308238061494),
+                                   [("Navaratriyear (latent)", -6.533061829540727),
+                                    ("Father's Dayyear (latent)", -6.533061829540727),
+                                    ("Karva Chauthyear (latent)", -6.533061829540727),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.540308238061494),
-                                    ("Maha Shivaratriyear (latent)", -6.540308238061494),
-                                    ("Ramadanyear (latent)", -5.287545269566126),
+                                     -6.533061829540727),
+                                    ("Maha Shivaratriyear (latent)", -6.533061829540727),
+                                    ("Ramadanyear (latent)", -5.280298861045359),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.154013876941603),
-                                    ("Military Spouse Dayyear (latent)", -6.540308238061494),
-                                    ("Bhai Doojyear (latent)", -6.540308238061494),
-                                    ("hourday", -4.5254052175192285),
-                                    ("dayhour", -3.4957858003380706),
+                                     -5.146767468420836),
+                                    ("Military Spouse Dayyear (latent)", -6.533061829540727),
+                                    ("Bhai Doojyear (latent)", -6.533061829540727),
+                                    ("hourday", -4.518158808998462),
+                                    ("dayhour", -3.4885393918173033),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.154013876941603),
-                                    ("Martin Luther King's Dayyear (latent)", -6.134843129953329),
-                                    ("Shemini Atzeretyear (latent)", -6.540308238061494),
-                                    ("daymonth", -4.5254052175192285),
-                                    ("monthday", -6.134843129953329),
-                                    ("monthyear", -4.748548768833438),
-                                    ("Yom Ha'atzmautyear (latent)", -6.540308238061494),
-                                    ("Vijayadashamiyear (latent)", -6.540308238061494),
+                                     -5.146767468420836),
+                                    ("Martin Luther King's Dayyear (latent)", -6.127596721432562),
+                                    ("Shemini Atzeretyear (latent)", -6.533061829540727),
+                                    ("daymonth", -4.518158808998462),
+                                    ("monthday", -6.127596721432562),
+                                    ("monthyear", -4.741302360312671),
+                                    ("Yom Ha'atzmautyear (latent)", -6.533061829540727),
+                                    ("Vijayadashamiyear (latent)", -6.533061829540727),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -5.154013876941603),
-                                    ("Thanksgiving Dayyear (latent)", -5.441695949393384),
-                                    ("Thai Pongalyear (latent)", -5.847161057501548),
-                                    ("Thiru Onamyear (latent)", -5.847161057501548),
-                                    ("hhhmmabsorption of , after named day", -6.540308238061494),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.540308238061494),
+                                     -5.146767468420836),
+                                    ("Thanksgiving Dayyear (latent)", -5.434449540872617),
+                                    ("Thai Pongalyear (latent)", -5.839914648980781),
+                                    ("Thiru Onamyear (latent)", -5.839914648980781),
+                                    ("hhhmmabsorption of , after named day", -6.533061829540727),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.533061829540727),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.6240175061873385),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.540308238061494),
-                                    ("Krishna Janmashtamiyear (latent)", -6.134843129953329),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.540308238061494),
-                                    ("houryear", -5.6240175061873385),
+                                     -5.616771097666572),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.533061829540727),
+                                    ("Krishna Janmashtamiyear (latent)", -6.127596721432562),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.533061829540727),
+                                    ("houryear", -5.616771097666572),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.540308238061494),
-                                    ("Christmas<time-of-day> am|pm", -6.540308238061494),
+                                     -6.533061829540727),
+                                    ("Christmas<time-of-day> am|pm", -6.533061829540727),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.540308238061494),
+                                     -6.533061829540727),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.847161057501548),
-                                    ("intersectin|during <named-month>|year", -6.540308238061494),
-                                    ("<time-of-day> am|pmintersect", -5.287545269566126),
-                                    ("Earth Houryear (latent)", -6.540308238061494),
-                                    ("Ganesh Chaturthiyear (latent)", -6.540308238061494),
-                                    ("Octoberyear (latent)", -5.036230841285219),
-                                    ("intersect<time-of-day> am|pm", -6.540308238061494),
-                                    ("Mattu Pongalyear (latent)", -6.540308238061494),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.540308238061494),
-                                    ("Daylight Saving Start Dayyear (latent)", -5.6240175061873385),
-                                    ("Shavuotyear (latent)", -6.540308238061494),
-                                    ("Parsi New Yearyear (latent)", -5.6240175061873385),
+                                     -5.839914648980781),
+                                    ("intersectin|during <named-month>|year", -6.533061829540727),
+                                    ("<time-of-day> am|pmintersect", -5.280298861045359),
+                                    ("Earth Houryear (latent)", -6.533061829540727),
+                                    ("Ganesh Chaturthiyear (latent)", -6.533061829540727),
+                                    ("Octoberyear (latent)", -5.028984432764452),
+                                    ("intersect<time-of-day> am|pm", -6.533061829540727),
+                                    ("Mattu Pongalyear (latent)", -6.533061829540727),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.533061829540727),
+                                    ("Daylight Saving Start Dayyear (latent)", -5.616771097666572),
+                                    ("Shavuotyear (latent)", -6.533061829540727),
+                                    ("Parsi New Yearyear (latent)", -5.616771097666572),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.540308238061494),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.540308238061494),
-                                    ("todayin|within|after <duration>", -6.540308238061494),
+                                     -6.533061829540727),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.533061829540727),
+                                    ("todayin|within|after <duration>", -6.533061829540727),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.134843129953329),
-                                    ("Marchyear (latent)", -6.540308238061494),
+                                     -6.127596721432562),
+                                    ("Marchyear (latent)", -6.533061829540727),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.134843129953329),
-                                    ("Sukkotyear (latent)", -6.134843129953329),
-                                    ("hhhmmintersect", -6.134843129953329),
+                                     -6.127596721432562),
+                                    ("Sukkotyear (latent)", -6.127596721432562),
+                                    ("hhhmmintersect", -6.127596721432562),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.134843129953329),
-                                    ("Daylight Saving End Dayyear (latent)", -5.6240175061873385),
-                                    ("Clean Mondayyear (latent)", -6.134843129953329),
-                                    ("monthhour", -6.134843129953329),
+                                     -6.127596721432562),
+                                    ("Daylight Saving End Dayyear (latent)", -5.616771097666572),
+                                    ("Clean Mondayyear (latent)", -6.127596721432562),
+                                    ("monthhour", -6.127596721432562),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.847161057501548),
-                                    ("todayat <time-of-day>", -6.540308238061494),
-                                    ("Thursday<time> timezone", -4.142412965263123),
-                                    ("tonight<time-of-day> am|pm", -6.540308238061494),
-                                    ("time-of-day (latent)tonight", -6.134843129953329),
-                                    ("from|since|after <time>December", -6.540308238061494),
+                                     -5.839914648980781),
+                                    ("todayat <time-of-day>", -6.533061829540727),
+                                    ("Thursday<time> timezone", -4.135166556742356),
+                                    ("tonight<time-of-day> am|pm", -6.533061829540727),
+                                    ("time-of-day (latent)tonight", -6.127596721432562),
+                                    ("from|since|after <time>December", -6.533061829540727),
                                     ("Emergency Medical Services for Children Dayyear (latent)",
-                                     -6.540308238061494),
-                                    ("<time-of-day> am|pmon <day>", -4.5254052175192285),
+                                     -6.533061829540727),
+                                    ("<time-of-day> am|pmon <day>", -4.518158808998462),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.540308238061494),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.134843129953329),
-                                    ("Tax Daythis|last|next <cycle>", -6.540308238061494),
-                                    ("dayday", -3.8322580369592836),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.134843129953329),
-                                    ("mm/ddat <time-of-day>", -6.540308238061494),
-                                    ("tonightat <time-of-day>", -5.847161057501548),
+                                     -6.533061829540727),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.127596721432562),
+                                    ("Tax Daythis|last|next <cycle>", -6.533061829540727),
+                                    ("dayday", -3.8250116284385163),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.127596721432562),
+                                    ("mm/ddat <time-of-day>", -6.533061829540727),
+                                    ("tonightat <time-of-day>", -5.839914648980781),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.847161057501548),
+                                     -5.839914648980781),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.540308238061494),
-                                    ("today<time-of-day> am|pm", -6.540308238061494),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.134843129953329),
-                                    ("at <time-of-day><time> <part-of-day>", -6.540308238061494),
-                                    ("<day-of-month> (ordinal)intersect", -6.134843129953329),
-                                    ("mm/dd<time-of-day> am|pm", -6.540308238061494),
-                                    ("hourhour", -3.6499364801653287),
-                                    ("Mahavir Jayantiyear (latent)", -6.134843129953329),
-                                    ("Navaratriin|during <named-month>|year", -6.540308238061494),
-                                    ("Wednesdaythis|last|next <cycle>", -6.540308238061494),
-                                    ("Lentyear (latent)", -6.540308238061494),
+                                     -6.533061829540727),
+                                    ("today<time-of-day> am|pm", -6.533061829540727),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.127596721432562),
+                                    ("at <time-of-day><time> <part-of-day>", -6.533061829540727),
+                                    ("<day-of-month> (ordinal)intersect", -6.127596721432562),
+                                    ("mm/dd<time-of-day> am|pm", -6.533061829540727),
+                                    ("hourhour", -3.642690071644562),
+                                    ("Mahavir Jayantiyear (latent)", -6.127596721432562),
+                                    ("Navaratriin|during <named-month>|year", -6.533061829540727),
+                                    ("Wednesdaythis|last|next <cycle>", -6.533061829540727),
+                                    ("Lentyear (latent)", -6.533061829540727),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.668506061159902),
-                                    ("Boghiyear (latent)", -6.540308238061494),
-                                    ("dayyear", -1.821809366766399),
+                                     -4.661259652639135),
+                                    ("Boghiyear (latent)", -6.533061829540727),
+                                    ("dayyear", -1.8145629582456317),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.540308238061494),
-                                    ("Thursdayfrom|since|after <time>", -6.134843129953329),
+                                     -6.533061829540727),
+                                    ("Thursdayfrom|since|after <time>", -6.127596721432562),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.540308238061494),
-                                    ("Thursdayat <time-of-day>", -5.847161057501548),
-                                    ("Islamic New Yearyear (latent)", -6.134843129953329),
-                                    ("Laylat al-Qadryear (latent)", -5.6240175061873385),
-                                    ("part of days<time-of-day> am|pm", -6.540308238061494),
-                                    ("Shrove Tuesdayyear (latent)", -6.540308238061494),
+                                     -6.533061829540727),
+                                    ("Thursdayat <time-of-day>", -5.839914648980781),
+                                    ("Islamic New Yearyear (latent)", -6.127596721432562),
+                                    ("Laylat al-Qadryear (latent)", -5.616771097666572),
+                                    ("part of days<time-of-day> am|pm", -6.533061829540727),
+                                    ("Shrove Tuesdayyear (latent)", -6.533061829540727),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.847161057501548),
-                                    ("hourminute", -6.134843129953329),
-                                    ("<time-of-day> am|pmtomorrow", -5.847161057501548),
-                                    ("Yom Kippuryear (latent)", -6.540308238061494),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.134843129953329),
-                                    ("<part-of-day> of <time>year (latent)", -6.540308238061494),
-                                    ("minutehour", -5.287545269566126),
-                                    ("Kaanum Pongalyear (latent)", -6.134843129953329),
-                                    ("Maha Saptamiyear (latent)", -6.540308238061494),
+                                     -5.839914648980781),
+                                    ("hourminute", -6.127596721432562),
+                                    ("<time-of-day> am|pmtomorrow", -5.839914648980781),
+                                    ("Yom Kippuryear (latent)", -6.533061829540727),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.127596721432562),
+                                    ("<part-of-day> of <time>year (latent)", -6.533061829540727),
+                                    ("minutehour", -5.280298861045359),
+                                    ("Kaanum Pongalyear (latent)", -6.127596721432562),
+                                    ("Maha Saptamiyear (latent)", -6.533061829540727),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.847161057501548),
-                                    ("time-of-day (latent)tomorrow", -5.6240175061873385),
-                                    ("part of daysat <time-of-day>", -4.930870325627393),
+                                     -5.839914648980781),
+                                    ("time-of-day (latent)tomorrow", -5.616771097666572),
+                                    ("part of daysat <time-of-day>", -4.923623917106626),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.5254052175192285),
-                                    ("for <duration> from <time>December", -6.540308238061494),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.540308238061494),
+                                     -4.518158808998462),
+                                    ("for <duration> from <time>December", -6.533061829540727),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.533061829540727),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.287545269566126),
+                                     -5.280298861045359),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.287545269566126),
-                                    ("time-of-day (latent)this <part-of-day>", -6.540308238061494),
-                                    ("Pentecostyear (latent)", -6.540308238061494),
+                                     -5.280298861045359),
+                                    ("time-of-day (latent)this <part-of-day>", -6.533061829540727),
+                                    ("Pentecostyear (latent)", -6.533061829540727),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.287545269566126),
-                                    ("<day-of-month> (ordinal)February", -6.540308238061494),
-                                    ("Eid al-Fitryear (latent)", -5.154013876941603),
+                                     -5.280298861045359),
+                                    ("<day-of-month> (ordinal)February", -6.533061829540727),
+                                    ("Eid al-Fitryear (latent)", -5.146767468420836),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.540308238061494),
-                                    ("Mondayin|during the <part-of-day>", -6.540308238061494),
-                                    ("Chhathin|during <named-month>|year", -6.540308238061494),
-                                    ("Diwaliin|during <named-month>|year", -6.540308238061494),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.540308238061494),
-                                    ("Vaisakhiin|during <named-month>|year", -6.540308238061494),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.287545269566126),
-                                    ("Raksha Bandhanyear (latent)", -6.540308238061494),
-                                    ("daysecond", -6.134843129953329),
+                                     -6.533061829540727),
+                                    ("Mondayin|during the <part-of-day>", -6.533061829540727),
+                                    ("Chhathin|during <named-month>|year", -6.533061829540727),
+                                    ("Diwaliin|during <named-month>|year", -6.533061829540727),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.533061829540727),
+                                    ("Vaisakhiin|during <named-month>|year", -6.533061829540727),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.280298861045359),
+                                    ("Raksha Bandhanyear (latent)", -6.533061829540727),
+                                    ("daysecond", -6.127596721432562),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.134843129953329),
-                                    ("Emancipation Dayyear (latent)", -5.847161057501548),
-                                    ("Ratha-Yatrayear (latent)", -6.540308238061494),
-                                    ("Ashurayear (latent)", -6.540308238061494),
-                                    ("Tuesdayin|during <named-month>|year", -6.540308238061494),
-                                    ("Chinese New Yearyear (latent)", -6.540308238061494),
-                                    ("tomorrowintersect", -6.540308238061494),
-                                    ("Lag BaOmeryear (latent)", -6.540308238061494),
+                                     -6.127596721432562),
+                                    ("Emancipation Dayyear (latent)", -5.839914648980781),
+                                    ("Ratha-Yatrayear (latent)", -6.533061829540727),
+                                    ("Ashurayear (latent)", -6.533061829540727),
+                                    ("Tuesdayin|during <named-month>|year", -6.533061829540727),
+                                    ("Chinese New Yearyear (latent)", -6.533061829540727),
+                                    ("tomorrowintersect", -6.533061829540727),
+                                    ("Lag BaOmeryear (latent)", -6.533061829540727),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.540308238061494),
-                                    ("Eid al-Adhayear (latent)", -4.400242074565223),
-                                    ("intersectin|during the <part-of-day>", -6.540308238061494),
-                                    ("Palm Sundayyear (latent)", -6.540308238061494),
-                                    ("Christmasat <time-of-day>", -6.540308238061494),
-                                    ("Passoveryear (latent)", -6.540308238061494),
-                                    ("Lazarus Saturdayyear (latent)", -6.540308238061494),
+                                     -6.533061829540727),
+                                    ("Eid al-Adhayear (latent)", -4.392995666044456),
+                                    ("intersectin|during the <part-of-day>", -6.533061829540727),
+                                    ("Palm Sundayyear (latent)", -6.533061829540727),
+                                    ("Christmasat <time-of-day>", -6.533061829540727),
+                                    ("Passoveryear (latent)", -6.533061829540727),
+                                    ("Lazarus Saturdayyear (latent)", -6.533061829540727),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.540308238061494),
-                                    ("Cyber Mondayyear (latent)", -6.134843129953329),
-                                    ("hhhmmon <day>", -5.6240175061873385),
-                                    ("Yom HaShoahyear (latent)", -6.134843129953329),
+                                     -6.533061829540727),
+                                    ("Cyber Mondayyear (latent)", -6.127596721432562),
+                                    ("hhhmmon <day>", -5.616771097666572),
+                                    ("Yom HaShoahyear (latent)", -6.127596721432562),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.134843129953329),
+                                     -6.127596721432562),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.540308238061494),
-                                    ("Septemberyear (latent)", -6.134843129953329),
+                                     -6.533061829540727),
+                                    ("Septemberyear (latent)", -6.127596721432562),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.036230841285219),
-                                    ("Halloweenyear (latent)", -6.540308238061494),
+                                     -5.028984432764452),
+                                    ("Halloweenyear (latent)", -6.533061829540727),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.134843129953329),
+                                     -6.127596721432562),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.847161057501548),
+                                     -5.839914648980781),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.540308238061494),
-                                    ("at <time-of-day>intersect", -5.6240175061873385),
-                                    ("Rosh Hashanahyear (latent)", -5.847161057501548),
-                                    ("Dhanterasyear (latent)", -6.540308238061494),
-                                    ("Tu BiShvatyear (latent)", -6.540308238061494),
-                                    ("<day-of-month> (ordinal)December", -5.847161057501548),
-                                    ("Holiyear (latent)", -5.847161057501548),
+                                     -6.533061829540727),
+                                    ("at <time-of-day>intersect", -5.616771097666572),
+                                    ("Rosh Hashanahyear (latent)", -5.839914648980781),
+                                    ("Dhanterasyear (latent)", -6.533061829540727),
+                                    ("Tu BiShvatyear (latent)", -6.533061829540727),
+                                    ("<day-of-month> (ordinal)December", -5.839914648980781),
+                                    ("Holiyear (latent)", -5.839914648980781),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.540308238061494),
-                                    ("Holika Dahanyear (latent)", -5.847161057501548),
+                                     -6.533061829540727),
+                                    ("Holika Dahanyear (latent)", -5.839914648980781),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.134843129953329),
-                                    ("dayminute", -3.1904041507868888),
-                                    ("Mawlidyear (latent)", -6.540308238061494),
+                                     -6.127596721432562),
+                                    ("dayminute", -3.1831577422661215),
+                                    ("Mawlidyear (latent)", -6.533061829540727),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.134843129953329),
+                                     -6.127596721432562),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.540308238061494),
-                                    ("Jumu'atul-Widayear (latent)", -5.6240175061873385),
-                                    ("minuteday", -2.733645748291174),
+                                     -6.533061829540727),
+                                    ("Jumu'atul-Widayear (latent)", -5.616771097666572),
+                                    ("minuteday", -2.795392211257358),
                                     ("absorption of , after named dayintersect",
-                                     -5.847161057501548),
-                                    ("intersectyear (latent)", -6.540308238061494),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.540308238061494),
+                                     -5.839914648980781),
+                                    ("intersectyear (latent)", -6.533061829540727),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.533061829540727),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.540308238061494),
+                                     -6.533061829540727),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.540308238061494),
-                                    ("intersecthhhmm", -6.134843129953329),
+                                     -6.533061829540727),
+                                    ("intersecthhhmm", -6.127596721432562),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.540308238061494),
-                                    ("Boss's Dayyear (latent)", -6.134843129953329),
+                                     -6.533061829540727),
+                                    ("Boss's Dayyear (latent)", -6.127596721432562),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.540308238061494),
-                                    ("Global Youth Service Dayyear (latent)", -6.540308238061494),
-                                    ("Dhanterasin|during <named-month>|year", -6.540308238061494),
-                                    ("Tisha B'Avyear (latent)", -6.540308238061494),
-                                    ("Isra and Mi'rajyear (latent)", -5.6240175061873385),
-                                    ("at <time-of-day>on <day>", -4.930870325627393),
+                                     -6.533061829540727),
+                                    ("Global Youth Service Dayyear (latent)", -6.533061829540727),
+                                    ("Dhanterasin|during <named-month>|year", -6.533061829540727),
+                                    ("Tisha B'Avyear (latent)", -6.533061829540727),
+                                    ("Isra and Mi'rajyear (latent)", -5.616771097666572),
+                                    ("at <time-of-day>on <day>", -4.923623917106626),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.134843129953329),
+                                     -6.127596721432562),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.847161057501548),
-                                    ("Christmasyear (latent)", -6.134843129953329),
-                                    ("Saturdayintersect", -6.540308238061494),
-                                    ("Naraka Chaturdashiyear (latent)", -6.134843129953329),
-                                    ("Thai Pongalin|during <named-month>|year", -6.540308238061494),
+                                     -5.839914648980781),
+                                    ("Christmasyear (latent)", -6.127596721432562),
+                                    ("Saturdayintersect", -6.533061829540727),
+                                    ("Naraka Chaturdashiyear (latent)", -6.127596721432562),
+                                    ("Thai Pongalin|during <named-month>|year", -6.533061829540727),
                                     ("Emergency Medical Services Weekyear (latent)",
-                                     -6.540308238061494),
-                                    ("dayweek", -6.540308238061494),
-                                    ("Easter Sundayyear (latent)", -5.847161057501548),
+                                     -6.533061829540727),
+                                    ("dayweek", -6.533061829540727),
+                                    ("Easter Sundayyear (latent)", -5.839914648980781),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.441695949393384),
-                                    ("weekyear", -5.441695949393384),
-                                    ("King's Dayyear (latent)", -5.036230841285219),
-                                    ("hh:mmin|during the <part-of-day>", -5.6240175061873385),
+                                     -6.127596721432562),
+                                    ("weekyear", -5.434449540872617),
+                                    ("King's Dayyear (latent)", -5.028984432764452),
+                                    ("hh:mmin|during the <part-of-day>", -5.616771097666572),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.134843129953329),
-                                    ("Hanukkahyear (latent)", -5.847161057501548),
-                                    ("Rama Navamiyear (latent)", -6.540308238061494),
-                                    ("February<time> <part-of-day>", -6.540308238061494),
-                                    ("National Grandparents Dayyear (latent)", -6.540308238061494),
+                                     -6.127596721432562),
+                                    ("Hanukkahyear (latent)", -5.839914648980781),
+                                    ("Rama Navamiyear (latent)", -6.533061829540727),
+                                    ("February<time> <part-of-day>", -6.533061829540727),
+                                    ("National Grandparents Dayyear (latent)", -6.533061829540727),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.847161057501548),
-                                    ("Great Lentyear (latent)", -6.540308238061494),
-                                    ("tomorrowat <time-of-day>", -5.847161057501548),
+                                     -5.839914648980781),
+                                    ("Great Lentyear (latent)", -6.533061829540727),
+                                    ("tomorrowat <time-of-day>", -5.839914648980781),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.540308238061494),
-                                    ("Labor Dayyear (latent)", -6.540308238061494),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.134843129953329),
-                                    ("Ugadiyear (latent)", -5.154013876941603),
-                                    ("Vaisakhiyear (latent)", -5.847161057501548),
+                                     -6.533061829540727),
+                                    ("Labor Dayyear (latent)", -6.533061829540727),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.127596721432562),
+                                    ("Ugadiyear (latent)", -5.146767468420836),
+                                    ("Vaisakhiyear (latent)", -5.839914648980781),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.847161057501548),
-                                    ("last <cycle> of <time>year (latent)", -5.847161057501548),
-                                    ("at <time-of-day>tomorrow", -6.134843129953329),
-                                    ("tomorrow<time-of-day> am|pm", -6.540308238061494),
-                                    ("President's Dayyear (latent)", -6.540308238061494),
+                                     -5.839914648980781),
+                                    ("last <cycle> of <time>year (latent)", -5.839914648980781),
+                                    ("at <time-of-day>tomorrow", -6.127596721432562),
+                                    ("tomorrow<time-of-day> am|pm", -6.533061829540727),
+                                    ("President's Dayyear (latent)", -6.533061829540727),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.540308238061494),
-                                    ("Diwaliyear (latent)", -6.540308238061494),
-                                    ("between <time> and <time>on <day>", -5.441695949393384),
-                                    ("Black Fridayyear (latent)", -6.134843129953329),
+                                     -6.533061829540727),
+                                    ("Diwaliyear (latent)", -6.533061829540727),
+                                    ("between <time> and <time>on <day>", -6.127596721432562),
+                                    ("Black Fridayyear (latent)", -6.127596721432562),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.540308238061494),
+                                     -6.533061829540727),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.540308238061494),
-                                    ("Chhathyear (latent)", -6.134843129953329),
-                                    ("Vasant Panchamiyear (latent)", -6.540308238061494),
-                                    ("Tax Dayyear (latent)", -5.6240175061873385),
-                                    ("Rabindra Jayantiyear (latent)", -5.287545269566126),
-                                    ("this <part-of-day>at <time-of-day>", -5.287545269566126),
-                                    ("St Patrick's Dayyear (latent)", -6.540308238061494),
-                                    ("Thursday<time> (timezone)", -6.540308238061494),
+                                     -6.533061829540727),
+                                    ("Chhathyear (latent)", -6.127596721432562),
+                                    ("Vasant Panchamiyear (latent)", -6.533061829540727),
+                                    ("Tax Dayyear (latent)", -5.616771097666572),
+                                    ("Rabindra Jayantiyear (latent)", -5.280298861045359),
+                                    ("this <part-of-day>at <time-of-day>", -5.280298861045359),
+                                    ("St Patrick's Dayyear (latent)", -6.533061829540727),
+                                    ("Thursday<time> (timezone)", -6.533061829540727),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.540308238061494),
-                                    ("Pargat Diwasyear (latent)", -5.287545269566126),
-                                    ("<datetime> - <datetime> (interval)July", -6.134843129953329),
+                                     -6.533061829540727),
+                                    ("Pargat Diwasyear (latent)", -5.280298861045359),
+                                    ("<datetime> - <datetime> (interval)July", -6.127596721432562),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.847161057501548),
-                                    ("Februaryintersect", -6.540308238061494),
-                                    ("Mother's Dayyear (latent)", -6.540308238061494),
-                                    ("Simchat Torahyear (latent)", -6.540308238061494),
-                                    ("minuteyear", -6.540308238061494)],
-                               n = 537},
+                                     -5.839914648980781),
+                                    ("Februaryintersect", -6.533061829540727),
+                                    ("Mother's Dayyear (latent)", -6.533061829540727),
+                                    ("Simchat Torahyear (latent)", -6.533061829540727),
+                                    ("minuteyear", -6.533061829540727)],
+                               n = 531},
                    koData =
-                     ClassData{prior = -1.0346741878427823, unseen = -6.806829360392176,
+                     ClassData{prior = -1.02528101558256, unseen = -6.811244378601293,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.608497976080766),
-                                    ("hourday", -3.586846728548785),
+                                   [("Thursdayhhhmm", -4.612917872778917),
+                                    ("hourday", -3.7190999967568206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.11257537285704),
-                                    ("<day-of-month> (ordinal)August", -6.11257537285704),
-                                    ("dayhour", -3.4384267234305113),
-                                    ("<time> timezoneyear (latent)", -5.419428192297095),
+                                     -6.116995269555192),
+                                    ("<day-of-month> (ordinal)August", -6.116995269555192),
+                                    ("dayhour", -3.4428466201286625),
+                                    ("<time> timezoneyear (latent)", -5.423848088995246),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.196284640982885),
-                                    ("Tuesdayfrom|since|after <time>", -5.419428192297095),
-                                    ("daymonth", -3.4384267234305113),
-                                    ("monthyear", -4.859812404361672),
-                                    ("<time-of-day> am|pmyear (latent)", -5.419428192297095),
-                                    ("Thai Pongalyear (latent)", -5.419428192297095),
-                                    ("intersecthh:mm", -6.11257537285704),
+                                     -5.200704537681037),
+                                    ("Tuesdayfrom|since|after <time>", -5.423848088995246),
+                                    ("daymonth", -3.4428466201286625),
+                                    ("monthyear", -4.864232301059824),
+                                    ("<time-of-day> am|pmyear (latent)", -5.423848088995246),
+                                    ("Thai Pongalyear (latent)", -5.423848088995246),
+                                    ("intersecthh:mm", -6.116995269555192),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.707110264748875),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.11257537285704),
-                                    ("houryear", -4.726281011737149),
+                                     -5.711530161447027),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.116995269555192),
+                                    ("houryear", -4.730700908435301),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.11257537285704),
-                                    ("<day-of-month> (ordinal)October", -6.11257537285704),
+                                     -6.116995269555192),
+                                    ("<day-of-month> (ordinal)October", -6.116995269555192),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.419428192297095),
-                                    ("hournograin", -4.859812404361672),
-                                    ("<time-of-day> am|pmintersect", -4.859812404361672),
-                                    ("Octoberyear (latent)", -6.11257537285704),
+                                     -5.423848088995246),
+                                    ("hournograin", -4.864232301059824),
+                                    ("<time-of-day> am|pmintersect", -4.864232301059824),
+                                    ("Octoberyear (latent)", -6.116995269555192),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.707110264748875),
-                                    ("early morningat <time-of-day>", -6.11257537285704),
-                                    ("until <time>on <day>", -5.419428192297095),
+                                     -5.711530161447027),
+                                    ("early morningat <time-of-day>", -6.116995269555192),
+                                    ("until <time>on <day>", -5.423848088995246),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.11257537285704),
-                                    ("time-of-day (latent)intersect", -5.419428192297095),
-                                    ("todayin <number> (implicit minutes)", -6.11257537285704),
+                                     -6.116995269555192),
+                                    ("time-of-day (latent)intersect", -5.423848088995246),
+                                    ("todayin <number> (implicit minutes)", -6.116995269555192),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.419428192297095),
+                                     -5.423848088995246),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.11257537285704),
-                                    ("about|exactly <time-of-day>year (latent)", -6.11257537285704),
-                                    ("hh:mmon <day>", -4.5031374604229395),
-                                    ("hhhmmintersect", -5.707110264748875),
-                                    ("absorption of , after named dayJuly", -5.196284640982885),
-                                    ("from|since|after <time>July", -5.707110264748875),
+                                     -6.116995269555192),
+                                    ("about|exactly <time-of-day>year (latent)",
+                                     -6.116995269555192),
+                                    ("hh:mmon <day>", -4.864232301059824),
+                                    ("hhhmmintersect", -5.711530161447027),
+                                    ("absorption of , after named dayJuly", -5.200704537681037),
+                                    ("from|since|after <time>July", -5.711530161447027),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.196284640982885),
-                                    ("Clean Mondayyear (latent)", -6.11257537285704),
-                                    ("monthhour", -6.11257537285704),
+                                     -5.200704537681037),
+                                    ("Clean Mondayyear (latent)", -6.116995269555192),
+                                    ("monthhour", -6.116995269555192),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.707110264748875),
-                                    ("hourmonth", -4.240773195955449),
-                                    ("todayat <time-of-day>", -6.11257537285704),
-                                    ("hhhmmyear (latent)", -4.859812404361672),
-                                    ("from|since|after <time>December", -6.11257537285704),
+                                     -5.711530161447027),
+                                    ("hourmonth", -4.2451930926536),
+                                    ("todayat <time-of-day>", -6.116995269555192),
+                                    ("hhhmmyear (latent)", -4.864232301059824),
+                                    ("from|since|after <time>December", -6.116995269555192),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.11257537285704),
-                                    ("<time-of-day> am|pmon <day>", -4.859812404361672),
-                                    ("Mondayyear (latent)", -5.01396308418893),
-                                    ("dayday", -4.726281011737149),
-                                    ("mm/ddat <time-of-day>", -5.707110264748875),
-                                    ("on <day>September", -5.419428192297095),
-                                    ("time-of-day (latent)September", -5.707110264748875),
-                                    ("hourhour", -4.033133831177204),
-                                    ("time-of-day (latent)on <day>", -4.3208159036289855),
+                                     -6.116995269555192),
+                                    ("<time-of-day> am|pmon <day>", -4.864232301059824),
+                                    ("Mondayyear (latent)", -5.018382980887082),
+                                    ("dayday", -4.102092249012927),
+                                    ("mm/ddat <time-of-day>", -5.711530161447027),
+                                    ("on <day>September", -5.423848088995246),
+                                    ("time-of-day (latent)September", -5.711530161447027),
+                                    ("hourhour", -4.0375537278753555),
+                                    ("time-of-day (latent)on <day>", -4.612917872778917),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.707110264748875),
-                                    ("dayyear", -3.116843099303049),
-                                    ("Thursdaymm/dd", -6.11257537285704),
-                                    ("New Year's Dayyear (latent)", -5.196284640982885),
-                                    ("time-of-day (latent)Sunday", -5.707110264748875),
-                                    ("Thursdayfrom|since|after <time>", -4.407827280618615),
-                                    ("Thursdayat <time-of-day>", -4.5031374604229395),
+                                     -5.711530161447027),
+                                    ("dayyear", -3.1212629960012004),
+                                    ("Thursdaymm/dd", -6.116995269555192),
+                                    ("New Year's Dayyear (latent)", -5.200704537681037),
+                                    ("time-of-day (latent)Sunday", -5.711530161447027),
+                                    ("Thursdayfrom|since|after <time>", -4.412247177316766),
+                                    ("Thursdayat <time-of-day>", -4.507557357121091),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.11257537285704),
-                                    ("Aprilyear (latent)", -6.11257537285704),
-                                    ("the <day-of-month> (ordinal)July", -6.11257537285704),
-                                    ("the <day-of-month> (number)July", -6.11257537285704),
-                                    ("monthminute", -6.11257537285704),
-                                    ("<time-of-day> am|pmtomorrow", -6.11257537285704),
-                                    ("Thursdayhh:mm", -5.196284640982885),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.707110264748875),
-                                    ("minutemonth", -3.9725092093607692),
-                                    ("time-of-day (latent)Friday", -5.707110264748875),
-                                    ("minutehour", -6.11257537285704),
-                                    ("part of daysat <time-of-day>", -5.01396308418893),
-                                    ("Augustyear (latent)", -5.707110264748875),
-                                    ("week-endin|during <named-month>|year", -6.11257537285704),
-                                    ("time-of-day (latent)Tuesday", -5.707110264748875),
+                                     -6.116995269555192),
+                                    ("Aprilyear (latent)", -6.116995269555192),
+                                    ("the <day-of-month> (ordinal)July", -6.116995269555192),
+                                    ("the <day-of-month> (number)July", -6.116995269555192),
+                                    ("monthminute", -6.116995269555192),
+                                    ("<time-of-day> am|pmtomorrow", -6.116995269555192),
+                                    ("Thursdayhh:mm", -5.200704537681037),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.711530161447027),
+                                    ("minutemonth", -3.9769291060589205),
+                                    ("time-of-day (latent)Friday", -5.711530161447027),
+                                    ("minutehour", -6.116995269555192),
+                                    ("part of daysat <time-of-day>", -5.018382980887082),
+                                    ("Augustyear (latent)", -5.711530161447027),
+                                    ("week-endin|during <named-month>|year", -6.116995269555192),
+                                    ("time-of-day (latent)Tuesday", -5.711530161447027),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.707110264748875),
+                                     -5.711530161447027),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.11257537285704),
+                                     -6.116995269555192),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.11257537285704),
-                                    ("Sundayyear (latent)", -5.196284640982885),
-                                    ("Christmasat <time-of-day>", -6.11257537285704),
-                                    ("from|since|after <time>year (latent)", -5.01396308418893),
-                                    ("hhhmmon <day>", -5.196284640982885),
-                                    ("yesterday<time-of-day> am|pm", -6.11257537285704),
-                                    ("<day-of-month> (ordinal)July", -5.419428192297095),
+                                     -6.116995269555192),
+                                    ("Sundayyear (latent)", -5.200704537681037),
+                                    ("the <day-of-month> (ordinal)Monday", -5.423848088995246),
+                                    ("Christmasat <time-of-day>", -6.116995269555192),
+                                    ("from|since|after <time>year (latent)", -5.018382980887082),
+                                    ("hhhmmon <day>", -5.200704537681037),
+                                    ("yesterday<time-of-day> am|pm", -6.116995269555192),
+                                    ("<day-of-month> (ordinal)July", -5.423848088995246),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.11257537285704),
-                                    ("mm/ddyear (latent)", -6.11257537285704),
+                                     -6.116995269555192),
+                                    ("mm/ddyear (latent)", -6.116995269555192),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.11257537285704),
+                                     -6.116995269555192),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.11257537285704),
-                                    ("at <time-of-day>intersect", -5.196284640982885),
-                                    ("hh:mmyear (latent)", -4.726281011737149),
-                                    ("Holiyear (latent)", -6.11257537285704),
-                                    ("until <time><time-of-day> am|pm", -6.11257537285704),
+                                     -6.116995269555192),
+                                    ("at <time-of-day>intersect", -5.200704537681037),
+                                    ("hh:mmyear (latent)", -4.730700908435301),
+                                    ("Holiyear (latent)", -6.116995269555192),
+                                    ("until <time><time-of-day> am|pm", -6.116995269555192),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.707110264748875),
-                                    ("dayminute", -3.250374491927572),
-                                    ("yyyy-mm-ddhh:mm", -5.707110264748875),
-                                    ("intersectfrom|since|after <time>", -5.707110264748875),
-                                    ("intersectSeptember", -4.240773195955449),
-                                    ("minuteday", -2.8936995479888394),
-                                    ("absorption of , after named dayintersect", -6.11257537285704),
-                                    ("intersectyear (latent)", -6.11257537285704),
-                                    ("Februaryin|during the <part-of-day>", -6.11257537285704),
+                                     -5.711530161447027),
+                                    ("dayminute", -3.254794388625723),
+                                    ("yyyy-mm-ddhh:mm", -5.711530161447027),
+                                    ("intersectfrom|since|after <time>", -5.711530161447027),
+                                    ("intersectSeptember", -4.2451930926536),
+                                    ("minuteday", -2.959994848405078),
+                                    ("absorption of , after named dayintersect",
+                                     -6.116995269555192),
+                                    ("intersectyear (latent)", -6.116995269555192),
+                                    ("Februaryin|during the <part-of-day>", -6.116995269555192),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.11257537285704),
-                                    ("time-of-day (latent)July", -5.419428192297095),
-                                    ("Saturdayyear (latent)", -6.11257537285704),
+                                     -6.116995269555192),
+                                    ("time-of-day (latent)July", -5.423848088995246),
+                                    ("Saturdayyear (latent)", -6.116995269555192),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.11257537285704),
-                                    ("at <time-of-day>on <day>", -5.196284640982885),
+                                     -6.116995269555192),
+                                    ("<day-of-month> (ordinal)Monday", -5.200704537681037),
+                                    ("at <time-of-day>on <day>", -5.200704537681037),
                                     ("absorption of , after named daySeptember",
-                                     -4.859812404361672),
-                                    ("Naraka Chaturdashiyear (latent)", -6.11257537285704),
-                                    ("from|since|after <time>on <day>", -5.196284640982885),
-                                    ("dayweek", -6.11257537285704),
-                                    ("Easter Sundayyear (latent)", -5.707110264748875),
-                                    ("Thursday<time-of-day> am|pm", -4.859812404361672),
-                                    ("weekyear", -5.707110264748875),
-                                    ("time-of-day (latent)Thursday", -5.707110264748875),
+                                     -4.864232301059824),
+                                    ("Naraka Chaturdashiyear (latent)", -6.116995269555192),
+                                    ("from|since|after <time>on <day>", -5.200704537681037),
+                                    ("dayweek", -6.116995269555192),
+                                    ("Easter Sundayyear (latent)", -5.711530161447027),
+                                    ("Thursday<time-of-day> am|pm", -4.864232301059824),
+                                    ("weekyear", -5.711530161447027),
+                                    ("time-of-day (latent)Thursday", -5.711530161447027),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.11257537285704),
-                                    ("<day-of-month> (ordinal)April", -6.11257537285704),
+                                     -6.116995269555192),
+                                    ("<day-of-month> (ordinal)April", -6.116995269555192),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.707110264748875),
+                                     -5.711530161447027),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.419428192297095),
-                                    ("Sundayfrom|since|after <time>", -6.11257537285704),
-                                    ("absorption of , after named dayFebruary", -5.196284640982885),
+                                     -5.423848088995246),
+                                    ("Sundayfrom|since|after <time>", -6.116995269555192),
+                                    ("absorption of , after named dayFebruary", -5.200704537681037),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.707110264748875),
+                                     -5.711530161447027),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.11257537285704),
-                                    ("tomorrowat <time-of-day>", -6.11257537285704),
-                                    ("daynograin", -5.707110264748875),
+                                     -6.116995269555192),
+                                    ("tomorrowat <time-of-day>", -6.116995269555192),
+                                    ("daynograin", -5.711530161447027),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.707110264748875),
-                                    ("last <cycle> of <time>year (latent)", -5.707110264748875),
-                                    ("tomorrow<time-of-day> am|pm", -6.11257537285704),
+                                     -5.711530161447027),
+                                    ("last <cycle> of <time>year (latent)", -5.711530161447027),
+                                    ("tomorrow<time-of-day> am|pm", -6.116995269555192),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.419428192297095),
-                                    ("Diwaliyear (latent)", -5.707110264748875),
+                                     -5.423848088995246),
+                                    ("Diwaliyear (latent)", -5.711530161447027),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.11257537285704),
-                                    ("this <part-of-day>at <time-of-day>", -5.196284640982885),
-                                    ("Fridayyear (latent)", -5.707110264748875),
-                                    ("time-of-day (latent)April", -6.11257537285704),
-                                    ("minuteyear", -3.915350795520821)],
-                               n = 296}}),
+                                     -6.116995269555192),
+                                    ("this <part-of-day>at <time-of-day>", -5.200704537681037),
+                                    ("Fridayyear (latent)", -5.711530161447027),
+                                    ("time-of-day (latent)April", -6.116995269555192),
+                                    ("minuteyear", -3.9197706922189717)],
+                               n = 297}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1485,8 +1503,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4965075614664802,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 31},
+                     ClassData{prior = 0.0, unseen = -3.6109179126442243,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 35},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1769,10 +1787,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.5108256237659907, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -0.916290731874155, unseen = -2.3025850929940455,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.3025850929940455,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 8}}),
        ("yesterday",
         Classifier{okData =
@@ -1865,27 +1885,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("National Grandparents Day",
         Classifier{okData =
@@ -1963,12 +1984,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2199,28 +2220,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15234072458201878,
-                               unseen = -5.1298987149230735,
+                     ClassData{prior = -0.23219338683412766,
+                               unseen = -5.241747015059643,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.153672065851137),
-                                    ("month (grain)", -2.8213788864092133),
-                                    ("year (grain)", -2.4159137783010487),
-                                    ("week (grain)", -1.153672065851137),
-                                    ("quarter", -3.5145260669691587), ("year", -2.4159137783010487),
-                                    ("month", -2.8213788864092133),
-                                    ("quarter (grain)", -3.5145260669691587)],
-                               n = 79},
+                                   [("week", -1.2661500492778275),
+                                    ("month (grain)", -2.528391761727739),
+                                    ("year (grain)", -2.292002983663509),
+                                    ("week (grain)", -1.2661500492778275),
+                                    ("quarter", -3.6270040503958487), ("year", -2.292002983663509),
+                                    ("month", -2.528391761727739),
+                                    ("quarter (grain)", -3.6270040503958487)],
+                               n = 88},
                    koData =
-                     ClassData{prior = -1.9568392195875037,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5740359853831845, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Mother's Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2305,7 +2329,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2313,14 +2338,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2427,19 +2452,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6481498146292096, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6227247162633995, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7402651035370151, unseen = -4.762173934797756,
+                     ClassData{prior = -0.7689072264414809, unseen = -4.709530201312334,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.145896398214498e-2),
-                                    ("integer (0..19)", -2.6741486494265287)],
-                               n = 114}}),
+                                   [("integer (numeric)", -7.550755250814517e-2),
+                                    ("integer (0..19)", -2.6210388241125804)],
+                               n = 108}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2571,21 +2596,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.1941560144409575, unseen = -4.189654742026425,
+                     ClassData{prior = -0.21511137961694557, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6894806201076367),
-                                    ("mm/dd", -3.481240089335692),
-                                    ("absorption of , after named day", -2.7880929087757464),
-                                    ("intersect", -2.7880929087757464),
-                                    ("Saturday", -2.7880929087757464),
-                                    ("Friday", -3.0757749812275272), ("day", -0.807091439909163),
-                                    ("the <day-of-month> (ordinal)", -3.0757749812275272),
+                                   [("Thursday", -1.8803128665695), ("mm/dd", -3.3843902633457743),
+                                    ("absorption of , after named day", -2.691243082785829),
+                                    ("intersect", -2.691243082785829),
+                                    ("Saturday", -2.691243082785829),
+                                    ("Friday", -2.9789251552376097), ("day", -0.8194409058842375),
+                                    ("the <day-of-month> (ordinal)", -2.9789251552376097),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.7880929087757464)],
-                               n = 28},
+                                     -2.691243082785829)],
+                               n = 25},
                    koData =
-                     ClassData{prior = -1.7346010553881064,
+                     ClassData{prior = -1.6422277352570913,
                                unseen = -3.0910424533583156,
                                likelihoods =
                                  HashMap.fromList
@@ -2668,15 +2692,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2700,11 +2730,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12361395596717664,
-                               unseen = -4.356708826689592,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 76},
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -4.276666119016055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 70},
                    koData =
-                     ClassData{prior = -2.151762203259462, unseen = -2.4849066497880004,
+                     ClassData{prior = -2.0794415416798357,
+                               unseen = -2.4849066497880004,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
@@ -2749,18 +2780,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2949,69 +2982,69 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.579818495252942, unseen = -5.356586274672012,
+                     ClassData{prior = -0.567520967442536, unseen = -5.375278407684165,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.658710952916121),
-                                    ("dayhour", -4.253245844807957),
-                                    ("daymonth", -2.3073356957526436),
+                                     -4.677490847567718),
+                                    ("dayhour", -4.272025739459553),
+                                    ("daymonth", -2.235143812198513),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.658710952916121),
+                                     -4.677490847567718),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.405947984420753),
-                                    ("Wednesdayintersect", -4.658710952916121),
-                                    ("Labor Daythis|last|next <cycle>", -4.658710952916121),
+                                     -3.4247278790723494),
+                                    ("Wednesdayintersect", -4.677490847567718),
+                                    ("Labor Daythis|last|next <cycle>", -4.677490847567718),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.2724165917962305),
-                                    ("Black Fridaythis|last|next <cycle>", -4.658710952916121),
-                                    ("<part-of-day> of <time>February", -4.658710952916121),
-                                    ("Saturday<time-of-day> am|pm", -4.658710952916121),
+                                     -3.2911964864478267),
+                                    ("Black Fridaythis|last|next <cycle>", -4.677490847567718),
+                                    ("<part-of-day> of <time>February", -4.677490847567718),
+                                    ("Saturday<time-of-day> am|pm", -4.677490847567718),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.253245844807957),
-                                    ("hourmonth", -4.658710952916121),
+                                     -4.272025739459553),
+                                    ("hourmonth", -4.677490847567718),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.965563772356176),
-                                    ("dayday", -2.407419154309626),
-                                    ("the <day-of-month> (ordinal)February", -4.253245844807957),
-                                    ("WednesdayOctober", -4.658710952916121),
-                                    ("Wednesdaythis|last|next <cycle>", -4.253245844807957),
+                                     -3.984343667007772),
+                                    ("dayday", -2.426199048961222),
+                                    ("the <day-of-month> (ordinal)February", -4.272025739459553),
+                                    ("WednesdayOctober", -4.677490847567718),
+                                    ("Wednesdaythis|last|next <cycle>", -4.272025739459553),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.405947984420753),
-                                    ("dayyear", -3.405947984420753),
+                                     -3.4247278790723494),
+                                    ("dayyear", -3.4247278790723494),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.658710952916121),
-                                    ("Thursdayhh:mm", -4.253245844807957),
-                                    ("Thanksgiving Daythis|last|next <cycle>", -4.658710952916121),
-                                    ("Memorial Daythis|last|next <cycle>", -4.658710952916121),
-                                    ("TuesdayOctober", -4.658710952916121),
-                                    ("the <day-of-month> (ordinal)March", -4.658710952916121),
-                                    ("Mondaythis|last|next <cycle>", -4.658710952916121),
-                                    ("Fridayintersect", -3.965563772356176),
+                                     -4.677490847567718),
+                                    ("Thursdayhh:mm", -4.272025739459553),
+                                    ("Thanksgiving Daythis|last|next <cycle>", -4.677490847567718),
+                                    ("Memorial Daythis|last|next <cycle>", -4.677490847567718),
+                                    ("TuesdayOctober", -4.677490847567718),
+                                    ("the <day-of-month> (ordinal)March", -4.677490847567718),
+                                    ("Mondaythis|last|next <cycle>", -3.984343667007772),
+                                    ("Fridayintersect", -3.984343667007772),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.253245844807957),
-                                    ("intersectOctober", -4.253245844807957),
+                                     -4.272025739459553),
+                                    ("intersectOctober", -4.272025739459553),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.742420221041966),
-                                    ("Tuesdaythis|last|next <cycle>", -4.658710952916121),
+                                     -3.7612001156935624),
+                                    ("Tuesdaythis|last|next <cycle>", -4.677490847567718),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.658710952916121),
-                                    ("dayminute", -2.8669514836880663),
-                                    ("minuteday", -3.405947984420753),
-                                    ("this|last|next <cycle>Sunday", -4.658710952916121),
-                                    ("Sundaythis|last|next <cycle>", -4.658710952916121),
-                                    ("on <day><time-of-day> am|pm", -4.658710952916121),
-                                    ("intersectintersect", -4.658710952916121),
-                                    ("weekday", -4.658710952916121),
-                                    ("dayweek", -3.5600986642480117),
+                                     -4.677490847567718),
+                                    ("dayminute", -2.8857313783396625),
+                                    ("minuteday", -3.4247278790723494),
+                                    ("this|last|next <cycle>Sunday", -4.677490847567718),
+                                    ("Sundaythis|last|next <cycle>", -4.677490847567718),
+                                    ("on <day><time-of-day> am|pm", -4.677490847567718),
+                                    ("intersectintersect", -4.677490847567718),
+                                    ("weekday", -4.677490847567718),
+                                    ("dayweek", -3.578878558899608),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.253245844807957),
-                                    ("<datetime> - <datetime> (interval)July", -3.742420221041966),
+                                     -4.272025739459553),
+                                    ("<datetime> - <datetime> (interval)July", -3.7612001156935624),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.965563772356176)],
-                               n = 70},
+                                     -3.984343667007772)],
+                               n = 72},
                    koData =
-                     ClassData{prior = -0.8209805520698302, unseen = -5.204006687076795,
+                     ClassData{prior = -0.8368539012261204, unseen = -5.204006687076795,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.505349850705881),
@@ -3128,7 +3161,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -3137,14 +3170,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3368,14 +3400,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3892,31 +3924,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_XX.hs b/Duckling/Ranking/Classifiers/EN_XX.hs
index 3e8973bb..3495c3cf 100644
--- a/Duckling/Ranking/Classifiers/EN_XX.hs
+++ b/Duckling/Ranking/Classifiers/EN_XX.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5962433749203424, unseen = -6.159095388491933,
+                     ClassData{prior = -0.5821088639854377, unseen = -6.159095388491933,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 471},
                    koData =
-                     ClassData{prior = -0.8004589163490333, unseen = -5.955837369464831,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 384}}),
+                     ClassData{prior = -0.8180731037287089, unseen = -5.924255797414532,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 372}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -615,28 +616,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -675,11 +676,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -0.16034265007517937,
+                               unseen = -3.2188758248682006,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 23},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9095425048844386, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -849,6 +851,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.457246097092175, unseen = -2.9444389791664407,
@@ -933,458 +947,459 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.45695407806624444,
-                               unseen = -7.1846291527173145,
+                     ClassData{prior = -0.4625501785911546, unseen = -7.1770187659099,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.490723534502507),
-                                    ("Karva Chauthyear (latent)", -6.490723534502507),
+                                   [("Navaratriyear (latent)", -6.483107351457199),
+                                    ("Karva Chauthyear (latent)", -6.483107351457199),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.490723534502507),
-                                    ("Maha Shivaratriyear (latent)", -6.490723534502507),
-                                    ("Ramadanyear (latent)", -5.237960566007139),
+                                     -6.483107351457199),
+                                    ("Maha Shivaratriyear (latent)", -6.483107351457199),
+                                    ("Ramadanyear (latent)", -5.230344382961831),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.104429173382616),
-                                    ("Bhai Doojyear (latent)", -6.490723534502507),
-                                    ("hourday", -4.475820513960243),
-                                    ("dayhour", -3.446201096779084),
+                                     -5.096812990337308),
+                                    ("Bhai Doojyear (latent)", -6.483107351457199),
+                                    ("hourday", -4.468204330914934),
+                                    ("dayhour", -3.438584913733776),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.104429173382616),
-                                    ("Martin Luther King's Dayyear (latent)", -6.085258426394343),
-                                    ("Shemini Atzeretyear (latent)", -6.490723534502507),
-                                    ("daymonth", -4.350657371006236),
-                                    ("monthday", -6.085258426394343),
-                                    ("monthyear", -4.618921357600916),
-                                    ("Yom Ha'atzmautyear (latent)", -6.490723534502507),
-                                    ("Vijayadashamiyear (latent)", -6.490723534502507),
-                                    ("Thanksgiving Dayyear (latent)", -5.392111245834397),
-                                    ("Thai Pongalyear (latent)", -5.797576353942562),
-                                    ("Thiru Onamyear (latent)", -5.797576353942562),
-                                    ("hhhmmabsorption of , after named day", -6.490723534502507),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.490723534502507),
+                                     -5.096812990337308),
+                                    ("Martin Luther King's Dayyear (latent)", -6.077642243349034),
+                                    ("Shemini Atzeretyear (latent)", -6.483107351457199),
+                                    ("daymonth", -4.343041187960928),
+                                    ("monthday", -6.077642243349034),
+                                    ("monthyear", -4.611305174555607),
+                                    ("Yom Ha'atzmautyear (latent)", -6.483107351457199),
+                                    ("Vijayadashamiyear (latent)", -6.483107351457199),
+                                    ("Thanksgiving Dayyear (latent)", -5.384495062789089),
+                                    ("Thai Pongalyear (latent)", -5.7899601708972535),
+                                    ("Thiru Onamyear (latent)", -5.7899601708972535),
+                                    ("hhhmmabsorption of , after named day", -6.483107351457199),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.483107351457199),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.574432802628352),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.490723534502507),
-                                    ("Krishna Janmashtamiyear (latent)", -6.085258426394343),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.490723534502507),
-                                    ("houryear", -5.574432802628352),
+                                     -5.566816619583044),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.483107351457199),
+                                    ("Krishna Janmashtamiyear (latent)", -6.077642243349034),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.483107351457199),
+                                    ("houryear", -5.566816619583044),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.490723534502507),
-                                    ("Christmas<time-of-day> am|pm", -6.490723534502507),
-                                    ("<day-of-month> (ordinal)October", -6.490723534502507),
+                                     -6.483107351457199),
+                                    ("Christmas<time-of-day> am|pm", -6.483107351457199),
+                                    ("<day-of-month> (ordinal)October", -6.483107351457199),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.490723534502507),
+                                     -6.483107351457199),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.797576353942562),
-                                    ("intersectin|during <named-month>|year", -6.490723534502507),
-                                    ("<time-of-day> am|pmintersect", -5.237960566007139),
-                                    ("Earth Houryear (latent)", -6.490723534502507),
-                                    ("Ganesh Chaturthiyear (latent)", -6.490723534502507),
-                                    ("Octoberyear (latent)", -4.881285622068407),
-                                    ("intersect<time-of-day> am|pm", -6.490723534502507),
-                                    ("Mattu Pongalyear (latent)", -6.490723534502507),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.490723534502507),
-                                    ("Shavuotyear (latent)", -6.490723534502507),
-                                    ("Parsi New Yearyear (latent)", -5.574432802628352),
+                                     -5.7899601708972535),
+                                    ("intersectin|during <named-month>|year", -6.483107351457199),
+                                    ("<time-of-day> am|pmintersect", -5.230344382961831),
+                                    ("Earth Houryear (latent)", -6.483107351457199),
+                                    ("Ganesh Chaturthiyear (latent)", -6.483107351457199),
+                                    ("Octoberyear (latent)", -4.873669439023098),
+                                    ("intersect<time-of-day> am|pm", -6.483107351457199),
+                                    ("Mattu Pongalyear (latent)", -6.483107351457199),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.483107351457199),
+                                    ("Shavuotyear (latent)", -6.483107351457199),
+                                    ("Parsi New Yearyear (latent)", -5.566816619583044),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.490723534502507),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.490723534502507),
-                                    ("todayin|within|after <duration>", -6.490723534502507),
+                                     -6.483107351457199),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.483107351457199),
+                                    ("todayin|within|after <duration>", -6.483107351457199),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.085258426394343),
-                                    ("Marchyear (latent)", -6.490723534502507),
+                                     -6.077642243349034),
+                                    ("Marchyear (latent)", -6.483107351457199),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.085258426394343),
-                                    ("Sukkotyear (latent)", -6.085258426394343),
-                                    ("hhhmmintersect", -6.085258426394343),
+                                     -6.077642243349034),
+                                    ("Sukkotyear (latent)", -6.077642243349034),
+                                    ("hhhmmintersect", -6.077642243349034),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.085258426394343),
-                                    ("Clean Mondayyear (latent)", -6.085258426394343),
-                                    ("monthhour", -6.085258426394343),
+                                     -6.077642243349034),
+                                    ("Clean Mondayyear (latent)", -6.077642243349034),
+                                    ("monthhour", -6.077642243349034),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.797576353942562),
-                                    ("todayat <time-of-day>", -6.490723534502507),
-                                    ("Thursday<time> timezone", -4.0928282617041365),
-                                    ("tonight<time-of-day> am|pm", -6.490723534502507),
-                                    ("time-of-day (latent)tonight", -6.085258426394343),
-                                    ("from|since|after <time>December", -6.490723534502507),
-                                    ("<time-of-day> am|pmon <day>", -4.475820513960243),
+                                     -5.7899601708972535),
+                                    ("todayat <time-of-day>", -6.483107351457199),
+                                    ("Thursday<time> timezone", -4.085212078658828),
+                                    ("tonight<time-of-day> am|pm", -6.483107351457199),
+                                    ("time-of-day (latent)tonight", -6.077642243349034),
+                                    ("from|since|after <time>December", -6.483107351457199),
+                                    ("<time-of-day> am|pmon <day>", -4.468204330914934),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.490723534502507),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.085258426394343),
-                                    ("dayday", -3.782673333400297),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.085258426394343),
-                                    ("mm/ddat <time-of-day>", -5.797576353942562),
-                                    ("tonightat <time-of-day>", -5.797576353942562),
+                                     -6.483107351457199),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.077642243349034),
+                                    ("dayday", -3.775057150354989),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.077642243349034),
+                                    ("mm/ddat <time-of-day>", -5.7899601708972535),
+                                    ("tonightat <time-of-day>", -5.7899601708972535),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.797576353942562),
+                                     -5.7899601708972535),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.490723534502507),
-                                    ("today<time-of-day> am|pm", -6.490723534502507),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.085258426394343),
-                                    ("at <time-of-day><time> <part-of-day>", -6.490723534502507),
-                                    ("<day-of-month> (ordinal)intersect", -5.797576353942562),
-                                    ("mm/dd<time-of-day> am|pm", -6.490723534502507),
-                                    ("hourhour", -3.6003517766063426),
-                                    ("Mahavir Jayantiyear (latent)", -6.085258426394343),
-                                    ("Navaratriin|during <named-month>|year", -6.490723534502507),
-                                    ("Wednesdaythis|last|next <cycle>", -6.490723534502507),
-                                    ("Lentyear (latent)", -6.490723534502507),
+                                     -6.483107351457199),
+                                    ("today<time-of-day> am|pm", -6.483107351457199),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.077642243349034),
+                                    ("at <time-of-day><time> <part-of-day>", -6.483107351457199),
+                                    ("<day-of-month> (ordinal)intersect", -5.7899601708972535),
+                                    ("mm/dd<time-of-day> am|pm", -6.483107351457199),
+                                    ("hourhour", -3.592735593561034),
+                                    ("Mahavir Jayantiyear (latent)", -6.077642243349034),
+                                    ("Navaratriin|during <named-month>|year", -6.483107351457199),
+                                    ("Wednesdaythis|last|next <cycle>", -6.483107351457199),
+                                    ("Lentyear (latent)", -6.483107351457199),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.618921357600916),
-                                    ("Boghiyear (latent)", -6.490723534502507),
-                                    ("dayyear", -1.921180526157567),
+                                     -4.611305174555607),
+                                    ("Boghiyear (latent)", -6.483107351457199),
+                                    ("dayyear", -1.9135643431122584),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.490723534502507),
-                                    ("Thursdayfrom|since|after <time>", -6.085258426394343),
+                                     -6.483107351457199),
+                                    ("Thursdayfrom|since|after <time>", -6.077642243349034),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.490723534502507),
-                                    ("Thursdayat <time-of-day>", -5.797576353942562),
-                                    ("Islamic New Yearyear (latent)", -6.085258426394343),
-                                    ("Laylat al-Qadryear (latent)", -5.574432802628352),
-                                    ("part of days<time-of-day> am|pm", -6.490723534502507),
-                                    ("Shrove Tuesdayyear (latent)", -6.490723534502507),
+                                     -6.483107351457199),
+                                    ("Thursdayat <time-of-day>", -5.7899601708972535),
+                                    ("Islamic New Yearyear (latent)", -6.077642243349034),
+                                    ("Laylat al-Qadryear (latent)", -5.566816619583044),
+                                    ("part of days<time-of-day> am|pm", -6.483107351457199),
+                                    ("Shrove Tuesdayyear (latent)", -6.483107351457199),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.797576353942562),
-                                    ("hourminute", -6.085258426394343),
-                                    ("<time-of-day> am|pmtomorrow", -5.797576353942562),
-                                    ("Yom Kippuryear (latent)", -6.490723534502507),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.085258426394343),
-                                    ("<part-of-day> of <time>year (latent)", -6.490723534502507),
-                                    ("minutehour", -5.237960566007139),
-                                    ("Kaanum Pongalyear (latent)", -6.085258426394343),
-                                    ("Maha Saptamiyear (latent)", -6.490723534502507),
+                                     -5.7899601708972535),
+                                    ("hourminute", -6.077642243349034),
+                                    ("<time-of-day> am|pmtomorrow", -5.7899601708972535),
+                                    ("Yom Kippuryear (latent)", -6.483107351457199),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.077642243349034),
+                                    ("<part-of-day> of <time>year (latent)", -6.483107351457199),
+                                    ("minutehour", -5.230344382961831),
+                                    ("Kaanum Pongalyear (latent)", -6.077642243349034),
+                                    ("Maha Saptamiyear (latent)", -6.483107351457199),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.797576353942562),
-                                    ("time-of-day (latent)tomorrow", -5.574432802628352),
-                                    ("part of daysat <time-of-day>", -4.881285622068407),
+                                     -5.7899601708972535),
+                                    ("time-of-day (latent)tomorrow", -5.566816619583044),
+                                    ("part of daysat <time-of-day>", -4.873669439023098),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.475820513960243),
-                                    ("for <duration> from <time>December", -6.490723534502507),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.490723534502507),
+                                     -4.468204330914934),
+                                    ("for <duration> from <time>December", -6.483107351457199),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.483107351457199),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.237960566007139),
+                                     -5.230344382961831),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.237960566007139),
-                                    ("time-of-day (latent)this <part-of-day>", -6.490723534502507),
-                                    ("Pentecostyear (latent)", -6.490723534502507),
+                                     -5.230344382961831),
+                                    ("time-of-day (latent)this <part-of-day>", -6.483107351457199),
+                                    ("Pentecostyear (latent)", -6.483107351457199),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.237960566007139),
-                                    ("<day-of-month> (ordinal)February", -6.490723534502507),
-                                    ("Eid al-Fitryear (latent)", -5.104429173382616),
+                                     -5.230344382961831),
+                                    ("<day-of-month> (ordinal)February", -6.483107351457199),
+                                    ("Eid al-Fitryear (latent)", -5.096812990337308),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.490723534502507),
-                                    ("Mondayin|during the <part-of-day>", -6.490723534502507),
-                                    ("Chhathin|during <named-month>|year", -6.490723534502507),
-                                    ("Diwaliin|during <named-month>|year", -6.490723534502507),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.490723534502507),
-                                    ("Vaisakhiin|during <named-month>|year", -6.490723534502507),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.237960566007139),
-                                    ("Raksha Bandhanyear (latent)", -6.490723534502507),
-                                    ("daysecond", -6.085258426394343),
+                                     -6.483107351457199),
+                                    ("Mondayin|during the <part-of-day>", -6.483107351457199),
+                                    ("Chhathin|during <named-month>|year", -6.483107351457199),
+                                    ("Diwaliin|during <named-month>|year", -6.483107351457199),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.483107351457199),
+                                    ("Vaisakhiin|during <named-month>|year", -6.483107351457199),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.230344382961831),
+                                    ("Raksha Bandhanyear (latent)", -6.483107351457199),
+                                    ("daysecond", -6.077642243349034),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.085258426394343),
-                                    ("Ratha-Yatrayear (latent)", -6.490723534502507),
-                                    ("Ashurayear (latent)", -6.490723534502507),
-                                    ("Tuesdayin|during <named-month>|year", -6.490723534502507),
-                                    ("Chinese New Yearyear (latent)", -6.490723534502507),
-                                    ("tomorrowintersect", -6.490723534502507),
-                                    ("Lag BaOmeryear (latent)", -6.490723534502507),
+                                     -6.077642243349034),
+                                    ("Ratha-Yatrayear (latent)", -6.483107351457199),
+                                    ("Ashurayear (latent)", -6.483107351457199),
+                                    ("Tuesdayin|during <named-month>|year", -6.483107351457199),
+                                    ("Chinese New Yearyear (latent)", -6.483107351457199),
+                                    ("tomorrowintersect", -6.483107351457199),
+                                    ("Lag BaOmeryear (latent)", -6.483107351457199),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.490723534502507),
-                                    ("Eid al-Adhayear (latent)", -4.350657371006236),
-                                    ("intersectin|during the <part-of-day>", -6.490723534502507),
-                                    ("Palm Sundayyear (latent)", -6.490723534502507),
-                                    ("Christmasat <time-of-day>", -6.490723534502507),
-                                    ("Passoveryear (latent)", -6.490723534502507),
-                                    ("Lazarus Saturdayyear (latent)", -6.490723534502507),
+                                     -6.483107351457199),
+                                    ("Eid al-Adhayear (latent)", -4.343041187960928),
+                                    ("intersectin|during the <part-of-day>", -6.483107351457199),
+                                    ("Palm Sundayyear (latent)", -6.483107351457199),
+                                    ("Christmasat <time-of-day>", -6.483107351457199),
+                                    ("Passoveryear (latent)", -6.483107351457199),
+                                    ("Lazarus Saturdayyear (latent)", -6.483107351457199),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.085258426394343),
-                                    ("hhhmmon <day>", -5.574432802628352),
-                                    ("Yom HaShoahyear (latent)", -6.085258426394343),
+                                     -6.077642243349034),
+                                    ("hhhmmon <day>", -5.566816619583044),
+                                    ("Yom HaShoahyear (latent)", -6.077642243349034),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.085258426394343),
+                                     -6.077642243349034),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.490723534502507),
-                                    ("Septemberyear (latent)", -6.085258426394343),
+                                     -6.483107351457199),
+                                    ("Septemberyear (latent)", -6.077642243349034),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.986646137726233),
-                                    ("Halloweenyear (latent)", -6.490723534502507),
+                                     -4.979029954680924),
+                                    ("Halloweenyear (latent)", -6.483107351457199),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.085258426394343),
+                                     -6.077642243349034),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.797576353942562),
+                                     -5.7899601708972535),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.490723534502507),
-                                    ("at <time-of-day>intersect", -5.574432802628352),
-                                    ("Rosh Hashanahyear (latent)", -5.797576353942562),
-                                    ("Dhanterasyear (latent)", -6.490723534502507),
-                                    ("Tu BiShvatyear (latent)", -6.490723534502507),
-                                    ("<day-of-month> (ordinal)December", -5.797576353942562),
-                                    ("Holiyear (latent)", -5.797576353942562),
+                                     -6.483107351457199),
+                                    ("at <time-of-day>intersect", -5.566816619583044),
+                                    ("Rosh Hashanahyear (latent)", -5.7899601708972535),
+                                    ("Dhanterasyear (latent)", -6.483107351457199),
+                                    ("Tu BiShvatyear (latent)", -6.483107351457199),
+                                    ("<day-of-month> (ordinal)December", -5.7899601708972535),
+                                    ("Holiyear (latent)", -5.7899601708972535),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.490723534502507),
-                                    ("Holika Dahanyear (latent)", -5.797576353942562),
+                                     -6.483107351457199),
+                                    ("Holika Dahanyear (latent)", -5.7899601708972535),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.085258426394343),
-                                    ("dayminute", -3.1063332711567333),
-                                    ("Mawlidyear (latent)", -6.490723534502507),
+                                     -6.077642243349034),
+                                    ("dayminute", -3.0987170881114245),
+                                    ("Mawlidyear (latent)", -6.483107351457199),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.085258426394343),
+                                     -6.077642243349034),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.490723534502507),
-                                    ("Jumu'atul-Widayear (latent)", -5.574432802628352),
-                                    ("minuteday", -2.6840610447321875),
+                                     -6.483107351457199),
+                                    ("Jumu'atul-Widayear (latent)", -5.566816619583044),
+                                    ("minuteday", -2.7454377331738304),
                                     ("absorption of , after named dayintersect",
-                                     -5.797576353942562),
-                                    ("intersectyear (latent)", -6.085258426394343),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.490723534502507),
+                                     -5.7899601708972535),
+                                    ("intersectyear (latent)", -6.077642243349034),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.483107351457199),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.490723534502507),
+                                     -6.483107351457199),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.490723534502507),
-                                    ("intersecthhhmm", -6.085258426394343),
+                                     -6.483107351457199),
+                                    ("intersecthhhmm", -6.077642243349034),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.490723534502507),
-                                    ("Boss's Dayyear (latent)", -6.085258426394343),
+                                     -6.483107351457199),
+                                    ("Boss's Dayyear (latent)", -6.077642243349034),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.490723534502507),
-                                    ("Global Youth Service Dayyear (latent)", -6.490723534502507),
-                                    ("Dhanterasin|during <named-month>|year", -6.490723534502507),
-                                    ("Tisha B'Avyear (latent)", -6.490723534502507),
-                                    ("Isra and Mi'rajyear (latent)", -5.574432802628352),
-                                    ("at <time-of-day>on <day>", -4.881285622068407),
+                                     -6.483107351457199),
+                                    ("Global Youth Service Dayyear (latent)", -6.483107351457199),
+                                    ("Dhanterasin|during <named-month>|year", -6.483107351457199),
+                                    ("Tisha B'Avyear (latent)", -6.483107351457199),
+                                    ("Isra and Mi'rajyear (latent)", -5.566816619583044),
+                                    ("at <time-of-day>on <day>", -4.873669439023098),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.085258426394343),
+                                     -6.077642243349034),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.797576353942562),
-                                    ("Christmasyear (latent)", -6.085258426394343),
-                                    ("Saturdayintersect", -6.490723534502507),
-                                    ("Naraka Chaturdashiyear (latent)", -6.085258426394343),
-                                    ("Thai Pongalin|during <named-month>|year", -6.490723534502507),
-                                    ("dayweek", -6.490723534502507),
-                                    ("Easter Sundayyear (latent)", -5.797576353942562),
+                                     -5.7899601708972535),
+                                    ("Christmasyear (latent)", -6.077642243349034),
+                                    ("Saturdayintersect", -6.483107351457199),
+                                    ("Naraka Chaturdashiyear (latent)", -6.077642243349034),
+                                    ("Thai Pongalin|during <named-month>|year", -6.483107351457199),
+                                    ("dayweek", -6.483107351457199),
+                                    ("Easter Sundayyear (latent)", -5.7899601708972535),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.392111245834397),
-                                    ("weekyear", -5.392111245834397),
-                                    ("King's Dayyear (latent)", -4.986646137726233),
-                                    ("hh:mmin|during the <part-of-day>", -5.574432802628352),
+                                     -6.077642243349034),
+                                    ("weekyear", -5.384495062789089),
+                                    ("King's Dayyear (latent)", -4.979029954680924),
+                                    ("hh:mmin|during the <part-of-day>", -5.566816619583044),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.085258426394343),
-                                    ("Hanukkahyear (latent)", -5.797576353942562),
-                                    ("Rama Navamiyear (latent)", -6.490723534502507),
-                                    ("February<time> <part-of-day>", -6.490723534502507),
+                                     -6.077642243349034),
+                                    ("Hanukkahyear (latent)", -5.7899601708972535),
+                                    ("Rama Navamiyear (latent)", -6.483107351457199),
+                                    ("February<time> <part-of-day>", -6.483107351457199),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.797576353942562),
-                                    ("Great Lentyear (latent)", -6.490723534502507),
-                                    ("tomorrowat <time-of-day>", -5.797576353942562),
+                                     -5.7899601708972535),
+                                    ("Great Lentyear (latent)", -6.483107351457199),
+                                    ("tomorrowat <time-of-day>", -5.7899601708972535),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.490723534502507),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.085258426394343),
-                                    ("Ugadiyear (latent)", -5.104429173382616),
-                                    ("Vaisakhiyear (latent)", -5.797576353942562),
+                                     -6.483107351457199),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.077642243349034),
+                                    ("Ugadiyear (latent)", -5.096812990337308),
+                                    ("Vaisakhiyear (latent)", -5.7899601708972535),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.797576353942562),
-                                    ("last <cycle> of <time>year (latent)", -5.797576353942562),
-                                    ("at <time-of-day>tomorrow", -6.085258426394343),
-                                    ("tomorrow<time-of-day> am|pm", -6.490723534502507),
+                                     -5.7899601708972535),
+                                    ("last <cycle> of <time>year (latent)", -5.7899601708972535),
+                                    ("at <time-of-day>tomorrow", -6.077642243349034),
+                                    ("tomorrow<time-of-day> am|pm", -6.483107351457199),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.490723534502507),
-                                    ("Diwaliyear (latent)", -6.490723534502507),
-                                    ("between <time> and <time>on <day>", -5.392111245834397),
-                                    ("Black Fridayyear (latent)", -6.085258426394343),
+                                     -6.483107351457199),
+                                    ("Diwaliyear (latent)", -6.483107351457199),
+                                    ("between <time> and <time>on <day>", -6.077642243349034),
+                                    ("Black Fridayyear (latent)", -6.077642243349034),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.490723534502507),
+                                     -6.483107351457199),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.490723534502507),
-                                    ("Chhathyear (latent)", -6.085258426394343),
-                                    ("Vasant Panchamiyear (latent)", -6.490723534502507),
-                                    ("Rabindra Jayantiyear (latent)", -5.237960566007139),
-                                    ("this <part-of-day>at <time-of-day>", -5.237960566007139),
-                                    ("St Patrick's Dayyear (latent)", -6.490723534502507),
-                                    ("Thursday<time> (timezone)", -6.490723534502507),
+                                     -6.483107351457199),
+                                    ("Chhathyear (latent)", -6.077642243349034),
+                                    ("Vasant Panchamiyear (latent)", -6.483107351457199),
+                                    ("Rabindra Jayantiyear (latent)", -5.230344382961831),
+                                    ("this <part-of-day>at <time-of-day>", -5.230344382961831),
+                                    ("St Patrick's Dayyear (latent)", -6.483107351457199),
+                                    ("Thursday<time> (timezone)", -6.483107351457199),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.490723534502507),
-                                    ("Pargat Diwasyear (latent)", -5.237960566007139),
-                                    ("<datetime> - <datetime> (interval)July", -6.085258426394343),
+                                     -6.483107351457199),
+                                    ("Pargat Diwasyear (latent)", -5.230344382961831),
+                                    ("<datetime> - <datetime> (interval)July", -6.077642243349034),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.797576353942562),
-                                    ("Februaryintersect", -6.490723534502507),
-                                    ("Simchat Torahyear (latent)", -6.490723534502507),
-                                    ("minuteyear", -6.490723534502507)],
-                               n = 511},
+                                     -5.7899601708972535),
+                                    ("Februaryintersect", -6.483107351457199),
+                                    ("Simchat Torahyear (latent)", -6.483107351457199),
+                                    ("minuteyear", -6.483107351457199)],
+                               n = 505},
                    koData =
-                     ClassData{prior = -1.0029642139458885, unseen = -6.790097235513905,
+                     ClassData{prior = -0.9933764690638148, unseen = -6.794586580876499,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.591747165655951),
-                                    ("hourday", -3.570095918123969),
+                                   [("Thursdayhhhmm", -4.59624155524379),
+                                    ("hourday", -3.7024236792216936),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.095824562432225),
-                                    ("<day-of-month> (ordinal)August", -6.095824562432225),
-                                    ("dayhour", -3.354984538507024),
-                                    ("<time> timezoneyear (latent)", -5.402677381872279),
+                                     -6.100318952020064),
+                                    ("<day-of-month> (ordinal)August", -6.100318952020064),
+                                    ("dayhour", -3.359478928094863),
+                                    ("<time> timezoneyear (latent)", -5.407171771460119),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.17953383055807),
-                                    ("Tuesdayfrom|since|after <time>", -5.402677381872279),
-                                    ("daymonth", -3.421675913005696),
-                                    ("monthyear", -4.843061593936857),
-                                    ("<time-of-day> am|pmyear (latent)", -5.402677381872279),
-                                    ("Thai Pongalyear (latent)", -5.402677381872279),
-                                    ("intersecthh:mm", -6.095824562432225),
+                                     -5.184028220145909),
+                                    ("Tuesdayfrom|since|after <time>", -5.407171771460119),
+                                    ("daymonth", -3.4261703025935355),
+                                    ("monthyear", -4.847555983524696),
+                                    ("<time-of-day> am|pmyear (latent)", -5.407171771460119),
+                                    ("Thai Pongalyear (latent)", -5.407171771460119),
+                                    ("intersecthh:mm", -6.100318952020064),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.69035945432406),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.095824562432225),
-                                    ("houryear", -4.709530201312334),
+                                     -5.6948538439119),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.100318952020064),
+                                    ("houryear", -4.7140245909001735),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.095824562432225),
-                                    ("<day-of-month> (ordinal)October", -6.095824562432225),
+                                     -6.100318952020064),
+                                    ("<day-of-month> (ordinal)October", -6.100318952020064),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.402677381872279),
-                                    ("hournograin", -4.843061593936857),
-                                    ("<time-of-day> am|pmintersect", -4.843061593936857),
-                                    ("Octoberyear (latent)", -6.095824562432225),
+                                     -5.407171771460119),
+                                    ("hournograin", -4.847555983524696),
+                                    ("<time-of-day> am|pmintersect", -4.847555983524696),
+                                    ("Octoberyear (latent)", -6.100318952020064),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.69035945432406),
-                                    ("early morningat <time-of-day>", -6.095824562432225),
-                                    ("until <time>on <day>", -5.402677381872279),
+                                     -5.6948538439119),
+                                    ("early morningat <time-of-day>", -6.100318952020064),
+                                    ("until <time>on <day>", -5.407171771460119),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.095824562432225),
-                                    ("time-of-day (latent)intersect", -5.402677381872279),
-                                    ("todayin <number> (implicit minutes)", -6.095824562432225),
+                                     -6.100318952020064),
+                                    ("time-of-day (latent)intersect", -5.407171771460119),
+                                    ("todayin <number> (implicit minutes)", -6.100318952020064),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.402677381872279),
+                                     -5.407171771460119),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.095824562432225),
+                                     -6.100318952020064),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.095824562432225),
-                                    ("hh:mmon <day>", -4.486386649998124),
-                                    ("hhhmmintersect", -5.69035945432406),
-                                    ("absorption of , after named dayJuly", -5.17953383055807),
-                                    ("from|since|after <time>July", -5.69035945432406),
+                                     -6.100318952020064),
+                                    ("hh:mmon <day>", -4.847555983524696),
+                                    ("hhhmmintersect", -5.6948538439119),
+                                    ("absorption of , after named dayJuly", -5.184028220145909),
+                                    ("from|since|after <time>July", -5.6948538439119),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.17953383055807),
-                                    ("Clean Mondayyear (latent)", -6.095824562432225),
-                                    ("monthhour", -6.095824562432225),
+                                     -5.184028220145909),
+                                    ("Clean Mondayyear (latent)", -6.100318952020064),
+                                    ("monthhour", -6.100318952020064),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.69035945432406),
-                                    ("hourmonth", -4.224022385530633),
-                                    ("todayat <time-of-day>", -6.095824562432225),
-                                    ("hhhmmyear (latent)", -4.843061593936857),
-                                    ("from|since|after <time>December", -6.095824562432225),
+                                     -5.6948538439119),
+                                    ("hourmonth", -4.2285167751184725),
+                                    ("todayat <time-of-day>", -6.100318952020064),
+                                    ("hhhmmyear (latent)", -4.847555983524696),
+                                    ("from|since|after <time>December", -6.100318952020064),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.095824562432225),
-                                    ("<time-of-day> am|pmon <day>", -4.843061593936857),
-                                    ("Mondayyear (latent)", -5.402677381872279),
-                                    ("dayday", -4.709530201312334),
-                                    ("mm/ddat <time-of-day>", -5.17953383055807),
-                                    ("on <day>September", -5.402677381872279),
-                                    ("time-of-day (latent)September", -5.69035945432406),
-                                    ("hourhour", -4.0163830207523885),
-                                    ("time-of-day (latent)on <day>", -4.304065093204169),
+                                     -6.100318952020064),
+                                    ("<time-of-day> am|pmon <day>", -4.847555983524696),
+                                    ("Mondayyear (latent)", -5.407171771460119),
+                                    ("dayday", -4.085415931477799),
+                                    ("mm/ddat <time-of-day>", -5.184028220145909),
+                                    ("on <day>September", -5.407171771460119),
+                                    ("time-of-day (latent)September", -5.6948538439119),
+                                    ("hourhour", -4.020877410340228),
+                                    ("time-of-day (latent)on <day>", -4.59624155524379),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.69035945432406),
-                                    ("dayyear", -3.1513855832657844),
-                                    ("Thursdaymm/dd", -6.095824562432225),
-                                    ("New Year's Dayyear (latent)", -5.17953383055807),
-                                    ("time-of-day (latent)Sunday", -5.69035945432406),
-                                    ("Thursdayfrom|since|after <time>", -4.391076470193799),
-                                    ("Thursdayat <time-of-day>", -4.486386649998124),
+                                     -5.6948538439119),
+                                    ("dayyear", -3.1558799728536235),
+                                    ("Thursdaymm/dd", -6.100318952020064),
+                                    ("New Year's Dayyear (latent)", -5.184028220145909),
+                                    ("time-of-day (latent)Sunday", -5.6948538439119),
+                                    ("Thursdayfrom|since|after <time>", -4.395570859781639),
+                                    ("Thursdayat <time-of-day>", -4.490881039585964),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.095824562432225),
-                                    ("Aprilyear (latent)", -6.095824562432225),
-                                    ("the <day-of-month> (ordinal)July", -6.095824562432225),
-                                    ("the <day-of-month> (number)July", -6.095824562432225),
-                                    ("monthminute", -6.095824562432225),
-                                    ("<time-of-day> am|pmtomorrow", -6.095824562432225),
-                                    ("Thursdayhh:mm", -5.17953383055807),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.69035945432406),
-                                    ("minutemonth", -3.955758398935954),
-                                    ("time-of-day (latent)Friday", -5.69035945432406),
-                                    ("minutehour", -6.095824562432225),
-                                    ("part of daysat <time-of-day>", -4.997212273764115),
-                                    ("Augustyear (latent)", -5.69035945432406),
-                                    ("week-endin|during <named-month>|year", -6.095824562432225),
-                                    ("time-of-day (latent)Tuesday", -5.69035945432406),
+                                     -6.100318952020064),
+                                    ("Aprilyear (latent)", -6.100318952020064),
+                                    ("the <day-of-month> (ordinal)July", -6.100318952020064),
+                                    ("the <day-of-month> (number)July", -6.100318952020064),
+                                    ("monthminute", -6.100318952020064),
+                                    ("<time-of-day> am|pmtomorrow", -6.100318952020064),
+                                    ("Thursdayhh:mm", -5.184028220145909),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.6948538439119),
+                                    ("minutemonth", -3.9602527885237935),
+                                    ("time-of-day (latent)Friday", -5.6948538439119),
+                                    ("minutehour", -6.100318952020064),
+                                    ("part of daysat <time-of-day>", -5.001706663351954),
+                                    ("Augustyear (latent)", -5.6948538439119),
+                                    ("week-endin|during <named-month>|year", -6.100318952020064),
+                                    ("time-of-day (latent)Tuesday", -5.6948538439119),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.69035945432406),
+                                     -5.6948538439119),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.095824562432225),
+                                     -6.100318952020064),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.095824562432225),
-                                    ("Sundayyear (latent)", -5.17953383055807),
-                                    ("Christmasat <time-of-day>", -6.095824562432225),
-                                    ("from|since|after <time>year (latent)", -4.997212273764115),
-                                    ("hhhmmon <day>", -5.17953383055807),
-                                    ("yesterday<time-of-day> am|pm", -6.095824562432225),
-                                    ("<day-of-month> (ordinal)July", -5.402677381872279),
+                                     -6.100318952020064),
+                                    ("Sundayyear (latent)", -5.184028220145909),
+                                    ("the <day-of-month> (ordinal)Monday", -5.407171771460119),
+                                    ("Christmasat <time-of-day>", -6.100318952020064),
+                                    ("from|since|after <time>year (latent)", -5.001706663351954),
+                                    ("hhhmmon <day>", -5.184028220145909),
+                                    ("yesterday<time-of-day> am|pm", -6.100318952020064),
+                                    ("<day-of-month> (ordinal)July", -5.407171771460119),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.095824562432225),
-                                    ("mm/ddyear (latent)", -6.095824562432225),
+                                     -6.100318952020064),
+                                    ("mm/ddyear (latent)", -6.100318952020064),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.095824562432225),
+                                     -6.100318952020064),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.095824562432225),
-                                    ("at <time-of-day>intersect", -5.17953383055807),
-                                    ("hh:mmyear (latent)", -4.709530201312334),
-                                    ("Holiyear (latent)", -6.095824562432225),
-                                    ("until <time><time-of-day> am|pm", -6.095824562432225),
+                                     -6.100318952020064),
+                                    ("at <time-of-day>intersect", -5.184028220145909),
+                                    ("hh:mmyear (latent)", -4.7140245909001735),
+                                    ("Holiyear (latent)", -6.100318952020064),
+                                    ("until <time><time-of-day> am|pm", -6.100318952020064),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.69035945432406),
-                                    ("dayminute", -3.2336236815027566),
-                                    ("yyyy-mm-ddhh:mm", -5.69035945432406),
-                                    ("intersectfrom|since|after <time>", -5.69035945432406),
-                                    ("intersectSeptember", -4.224022385530633),
-                                    ("minuteday", -2.876948737564024),
+                                     -5.6948538439119),
+                                    ("dayminute", -3.2381180710905957),
+                                    ("yyyy-mm-ddhh:mm", -5.6948538439119),
+                                    ("intersectfrom|since|after <time>", -5.6948538439119),
+                                    ("intersectSeptember", -4.2285167751184725),
+                                    ("minuteday", -2.9433185308699508),
                                     ("absorption of , after named dayintersect",
-                                     -6.095824562432225),
-                                    ("intersectyear (latent)", -6.095824562432225),
-                                    ("Februaryin|during the <part-of-day>", -6.095824562432225),
+                                     -6.100318952020064),
+                                    ("intersectyear (latent)", -6.100318952020064),
+                                    ("Februaryin|during the <part-of-day>", -6.100318952020064),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.095824562432225),
-                                    ("time-of-day (latent)July", -5.402677381872279),
-                                    ("Saturdayyear (latent)", -6.095824562432225),
+                                     -6.100318952020064),
+                                    ("time-of-day (latent)July", -5.407171771460119),
+                                    ("Saturdayyear (latent)", -6.100318952020064),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.095824562432225),
-                                    ("at <time-of-day>on <day>", -5.17953383055807),
+                                     -6.100318952020064),
+                                    ("<day-of-month> (ordinal)Monday", -5.184028220145909),
+                                    ("at <time-of-day>on <day>", -5.184028220145909),
                                     ("absorption of , after named daySeptember",
-                                     -4.843061593936857),
-                                    ("Naraka Chaturdashiyear (latent)", -6.095824562432225),
-                                    ("from|since|after <time>on <day>", -5.17953383055807),
-                                    ("dayweek", -6.095824562432225),
-                                    ("Easter Sundayyear (latent)", -5.69035945432406),
-                                    ("Thursday<time-of-day> am|pm", -4.843061593936857),
-                                    ("weekyear", -5.69035945432406),
-                                    ("time-of-day (latent)Thursday", -5.69035945432406),
+                                     -4.847555983524696),
+                                    ("Naraka Chaturdashiyear (latent)", -6.100318952020064),
+                                    ("from|since|after <time>on <day>", -5.184028220145909),
+                                    ("dayweek", -6.100318952020064),
+                                    ("Easter Sundayyear (latent)", -5.6948538439119),
+                                    ("Thursday<time-of-day> am|pm", -4.847555983524696),
+                                    ("weekyear", -5.6948538439119),
+                                    ("time-of-day (latent)Thursday", -5.6948538439119),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.095824562432225),
-                                    ("<day-of-month> (ordinal)April", -6.095824562432225),
+                                     -6.100318952020064),
+                                    ("<day-of-month> (ordinal)April", -6.100318952020064),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.69035945432406),
+                                     -5.6948538439119),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.402677381872279),
-                                    ("Sundayfrom|since|after <time>", -6.095824562432225),
-                                    ("absorption of , after named dayFebruary", -5.17953383055807),
+                                     -5.407171771460119),
+                                    ("Sundayfrom|since|after <time>", -6.100318952020064),
+                                    ("absorption of , after named dayFebruary", -5.184028220145909),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.69035945432406),
+                                     -5.6948538439119),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.095824562432225),
-                                    ("tomorrowat <time-of-day>", -6.095824562432225),
-                                    ("daynograin", -5.69035945432406),
+                                     -6.100318952020064),
+                                    ("tomorrowat <time-of-day>", -6.100318952020064),
+                                    ("daynograin", -5.6948538439119),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.69035945432406),
-                                    ("last <cycle> of <time>year (latent)", -5.69035945432406),
-                                    ("tomorrow<time-of-day> am|pm", -6.095824562432225),
+                                     -5.6948538439119),
+                                    ("last <cycle> of <time>year (latent)", -5.6948538439119),
+                                    ("tomorrow<time-of-day> am|pm", -6.100318952020064),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.402677381872279),
-                                    ("Diwaliyear (latent)", -5.69035945432406),
+                                     -5.407171771460119),
+                                    ("Diwaliyear (latent)", -5.6948538439119),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.095824562432225),
-                                    ("this <part-of-day>at <time-of-day>", -5.17953383055807),
-                                    ("Fridayyear (latent)", -5.69035945432406),
-                                    ("time-of-day (latent)April", -6.095824562432225),
-                                    ("minuteyear", -3.898599985096005)],
-                               n = 296}}),
+                                     -6.100318952020064),
+                                    ("this <part-of-day>at <time-of-day>", -5.184028220145909),
+                                    ("Fridayyear (latent)", -5.6948538439119),
+                                    ("time-of-day (latent)April", -6.100318952020064),
+                                    ("minuteyear", -3.9030943746838447)],
+                               n = 297}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1449,8 +1464,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
+                     ClassData{prior = 0.0, unseen = -3.5553480614894135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 33},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1726,10 +1741,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("yesterday",
@@ -1802,27 +1817,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1893,12 +1909,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2108,28 +2124,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15790302944580878,
-                               unseen = -5.093750200806762,
+                     ClassData{prior = -0.23947997063390317,
+                               unseen = -5.209486152841421,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.1173044216802621),
-                                    ("month (grain)", -2.7850112422383386),
-                                    ("year (grain)", -2.6026896854443837),
-                                    ("week (grain)", -1.1173044216802621),
-                                    ("quarter", -3.4781584227982836), ("year", -2.6026896854443837),
-                                    ("month", -2.7850112422383386),
-                                    ("quarter (grain)", -3.4781584227982836)],
-                               n = 76},
+                                   [("week", -1.2337147735246734),
+                                    ("month (grain)", -2.495956485974585),
+                                    ("year (grain)", -2.431417964837014),
+                                    ("week (grain)", -1.2337147735246734),
+                                    ("quarter", -3.594568774642695), ("year", -2.431417964837014),
+                                    ("month", -2.495956485974585),
+                                    ("quarter (grain)", -3.594568774642695)],
+                               n = 85},
                    koData =
-                     ClassData{prior = -1.9236870122706031,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.54663701119507, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2207,7 +2226,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2215,14 +2235,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2322,19 +2342,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6564831961883538, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6312717768418579, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7312067423842903, unseen = -4.77912349311153,
+                     ClassData{prior = -0.7591051483517427, unseen = -4.727387818712341,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.020425867324857e-2),
-                                    ("integer (0..19)", -2.691243082785829)],
-                               n = 116}}),
+                                   [("integer (numeric)", -7.410797215372185e-2),
+                                    ("integer (0..19)", -2.639057329615259)],
+                               n = 110}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2467,21 +2487,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.1941560144409575, unseen = -4.189654742026425,
+                     ClassData{prior = -0.21511137961694557, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6894806201076367),
-                                    ("mm/dd", -3.481240089335692),
-                                    ("absorption of , after named day", -2.7880929087757464),
-                                    ("intersect", -2.7880929087757464),
-                                    ("Saturday", -2.7880929087757464),
-                                    ("Friday", -3.0757749812275272), ("day", -0.807091439909163),
-                                    ("the <day-of-month> (ordinal)", -3.0757749812275272),
+                                   [("Thursday", -1.8803128665695), ("mm/dd", -3.3843902633457743),
+                                    ("absorption of , after named day", -2.691243082785829),
+                                    ("intersect", -2.691243082785829),
+                                    ("Saturday", -2.691243082785829),
+                                    ("Friday", -2.9789251552376097), ("day", -0.8194409058842375),
+                                    ("the <day-of-month> (ordinal)", -2.9789251552376097),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.7880929087757464)],
-                               n = 28},
+                                     -2.691243082785829)],
+                               n = 25},
                    koData =
-                     ClassData{prior = -1.7346010553881064,
+                     ClassData{prior = -1.6422277352570913,
                                unseen = -3.0910424533583156,
                                likelihoods =
                                  HashMap.fromList
@@ -2557,15 +2576,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2589,11 +2614,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.12361395596717664,
-                               unseen = -4.356708826689592,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 76},
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -4.276666119016055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 70},
                    koData =
-                     ClassData{prior = -2.151762203259462, unseen = -2.4849066497880004,
+                     ClassData{prior = -2.0794415416798357,
+                               unseen = -2.4849066497880004,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("Holi",
         Classifier{okData =
@@ -2638,18 +2664,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2835,67 +2863,67 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5926766501963108, unseen = -5.327876168789581,
+                     ClassData{prior = -0.579818495252942, unseen = -5.3471075307174685,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.629862798578463),
-                                    ("dayhour", -4.2243976904702984),
-                                    ("daymonth", -2.2784875414149854),
+                                     -4.6491870714048655),
+                                    ("dayhour", -4.243721963296701),
+                                    ("daymonth", -2.2068400360356613),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.629862798578463),
+                                     -4.6491870714048655),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.377099830083095),
-                                    ("Wednesdayintersect", -4.629862798578463),
+                                     -3.3964241029094975),
+                                    ("Wednesdayintersect", -4.6491870714048655),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.2435684374585723),
-                                    ("Black Fridaythis|last|next <cycle>", -4.629862798578463),
-                                    ("<part-of-day> of <time>February", -4.629862798578463),
-                                    ("Saturday<time-of-day> am|pm", -4.629862798578463),
+                                     -3.262892710284975),
+                                    ("Black Fridaythis|last|next <cycle>", -4.6491870714048655),
+                                    ("<part-of-day> of <time>February", -4.6491870714048655),
+                                    ("Saturday<time-of-day> am|pm", -4.6491870714048655),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.2243976904702984),
-                                    ("hourmonth", -4.629862798578463),
+                                     -4.243721963296701),
+                                    ("hourmonth", -4.6491870714048655),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9367156180185177),
-                                    ("dayday", -2.3785709999719677),
-                                    ("the <day-of-month> (ordinal)February", -4.2243976904702984),
-                                    ("WednesdayOctober", -4.629862798578463),
-                                    ("Wednesdaythis|last|next <cycle>", -4.2243976904702984),
+                                     -3.9560398908449206),
+                                    ("dayday", -2.3978952727983707),
+                                    ("the <day-of-month> (ordinal)February", -4.243721963296701),
+                                    ("WednesdayOctober", -4.6491870714048655),
+                                    ("Wednesdaythis|last|next <cycle>", -4.243721963296701),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.377099830083095),
-                                    ("dayyear", -3.713572066704308),
+                                     -3.3964241029094975),
+                                    ("dayyear", -3.7328963395307104),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.629862798578463),
-                                    ("Thursdayhh:mm", -4.2243976904702984),
-                                    ("Thanksgiving Daythis|last|next <cycle>", -4.629862798578463),
-                                    ("TuesdayOctober", -4.629862798578463),
-                                    ("the <day-of-month> (ordinal)March", -4.629862798578463),
-                                    ("Mondaythis|last|next <cycle>", -4.629862798578463),
-                                    ("Fridayintersect", -3.9367156180185177),
+                                     -4.6491870714048655),
+                                    ("Thursdayhh:mm", -4.243721963296701),
+                                    ("Thanksgiving Daythis|last|next <cycle>", -4.6491870714048655),
+                                    ("TuesdayOctober", -4.6491870714048655),
+                                    ("the <day-of-month> (ordinal)March", -4.6491870714048655),
+                                    ("Mondaythis|last|next <cycle>", -3.9560398908449206),
+                                    ("Fridayintersect", -3.9560398908449206),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.2243976904702984),
-                                    ("intersectOctober", -4.2243976904702984),
+                                     -4.243721963296701),
+                                    ("intersectOctober", -4.243721963296701),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.713572066704308),
-                                    ("Tuesdaythis|last|next <cycle>", -4.629862798578463),
+                                     -3.7328963395307104),
+                                    ("Tuesdaythis|last|next <cycle>", -4.6491870714048655),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.629862798578463),
-                                    ("dayminute", -2.8381033293504077),
-                                    ("minuteday", -3.377099830083095),
-                                    ("this|last|next <cycle>Sunday", -4.629862798578463),
-                                    ("Sundaythis|last|next <cycle>", -4.629862798578463),
-                                    ("on <day><time-of-day> am|pm", -4.629862798578463),
-                                    ("intersectintersect", -4.629862798578463),
-                                    ("weekday", -4.629862798578463),
-                                    ("dayweek", -3.531250509910353),
+                                     -4.6491870714048655),
+                                    ("dayminute", -2.8574276021768106),
+                                    ("minuteday", -3.3964241029094975),
+                                    ("this|last|next <cycle>Sunday", -4.6491870714048655),
+                                    ("Sundaythis|last|next <cycle>", -4.6491870714048655),
+                                    ("on <day><time-of-day> am|pm", -4.6491870714048655),
+                                    ("intersectintersect", -4.6491870714048655),
+                                    ("weekday", -4.6491870714048655),
+                                    ("dayweek", -3.550574782736756),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.2243976904702984),
-                                    ("<datetime> - <datetime> (interval)July", -3.713572066704308),
+                                     -4.243721963296701),
+                                    ("<datetime> - <datetime> (interval)July", -3.7328963395307104),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9367156180185177)],
-                               n = 68},
+                                     -3.9560398908449206)],
+                               n = 70},
                    koData =
-                     ClassData{prior = -0.8048511701399466, unseen = -5.19295685089021,
+                     ClassData{prior = -0.8209805520698302, unseen = -5.19295685089021,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.4942386252808095),
@@ -3002,8 +3030,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.42488319396526597,
-                               unseen = -2.995732273553991,
+                     ClassData{prior = -0.5679840376059393, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -3011,14 +3038,13 @@ classifiers
                                     ("ordinal (digits)", -0.2363887780642304)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.0608719606852628,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8362480242006186, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3230,14 +3256,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3731,31 +3757,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Ranking/Classifiers/EN_ZA.hs b/Duckling/Ranking/Classifiers/EN_ZA.hs
index 4a0a5993..ad8d2ecc 100644
--- a/Duckling/Ranking/Classifiers/EN_ZA.hs
+++ b/Duckling/Ranking/Classifiers/EN_ZA.hs
@@ -74,19 +74,20 @@ classifiers
                                n = 3}}),
        ("Thursday",
         Classifier{okData =
-                     ClassData{prior = -7.232066157962613e-2,
-                               unseen = -3.7376696182833684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 40},
+                     ClassData{prior = -7.79615414697118e-2,
+                               unseen = -3.6635616461296463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 37},
                    koData =
-                     ClassData{prior = -2.662587827025453, unseen = -1.6094379124341003,
+                     ClassData{prior = -2.5902671654458267,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5655118484605504, unseen = -6.133398042996649,
+                     ClassData{prior = -0.5505489757838379, unseen = -6.133398042996649,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 459},
                    koData =
-                     ClassData{prior = -0.8394901363186682, unseen = -5.860786223465865,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 349}}),
+                     ClassData{prior = -0.8595162554920214, unseen = -5.82600010738045,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 337}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -612,28 +613,28 @@ classifiers
                                n = 3}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.5389965007326869,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.2992829841302609),
-                                    ("hh:mmhh:mm", -1.4816045409242156),
+                                   [("minuteminute", -1.6739764335716716),
+                                    ("hh:mmhh:mm", -2.0794415416798357),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.3978952727983707),
-                                    ("hhhmmhhhmm", -2.3978952727983707),
-                                    ("minutehour", -1.9924301646902063),
+                                     -2.0794415416798357),
+                                    ("hhhmmhhhmm", -2.0794415416798357),
+                                    ("minutehour", -1.6739764335716716),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.3978952727983707)],
-                               n = 7},
+                                     -2.0794415416798357)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.2809338454620642),
-                                    ("minutehour", -1.0986122886681098),
-                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
-                               n = 5}}),
+                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
+                                    ("minutehour", -1.3862943611198906),
+                                    ("hhhmmtime-of-day (latent)", -1.791759469228055)],
+                               n = 2}}),
        ("Halloween",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -672,11 +673,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<integer> more <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -845,6 +847,18 @@ classifiers
                                     ("time-of-day (latent)in|during the <part-of-day>",
                                      -1.466337068793427)],
                                n = 2}}),
+       ("the nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.6931471805599453),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -0.6931471805599453)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
                      ClassData{prior = -1.4294665329850993,
@@ -926,448 +940,451 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4583667663325779,
-                               unseen = -7.1592919047975645,
+                     ClassData{prior = -0.4641310220451653, unseen = -7.151485463904735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.465366816769375),
-                                    ("Karva Chauthyear (latent)", -6.465366816769375),
+                                   [("Navaratriyear (latent)", -6.457554277032581),
+                                    ("Karva Chauthyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Maha Shivaratriyear (latent)", -6.465366816769375),
-                                    ("Ramadanyear (latent)", -5.212603848274007),
+                                     -6.457554277032581),
+                                    ("Maha Shivaratriyear (latent)", -6.457554277032581),
+                                    ("Ramadanyear (latent)", -5.204791308537213),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Bhai Doojyear (latent)", -6.465366816769375),
-                                    ("hourday", -4.45046379622711),
-                                    ("dayhour", -3.4208443790459517),
+                                     -5.071259915912691),
+                                    ("Bhai Doojyear (latent)", -6.457554277032581),
+                                    ("hourday", -4.442651256490317),
+                                    ("dayhour", -3.4130318393091583),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.079072455649484),
-                                    ("Martin Luther King's Dayyear (latent)", -6.059901708661211),
-                                    ("Shemini Atzeretyear (latent)", -6.465366816769375),
-                                    ("daymonth", -4.45046379622711),
-                                    ("monthday", -6.059901708661211),
-                                    ("monthyear", -4.67360734754132),
-                                    ("Yom Ha'atzmautyear (latent)", -6.465366816769375),
-                                    ("Vijayadashamiyear (latent)", -6.465366816769375),
-                                    ("Thai Pongalyear (latent)", -5.77221963620943),
-                                    ("Thiru Onamyear (latent)", -5.77221963620943),
-                                    ("hhhmmabsorption of , after named day", -6.465366816769375),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.465366816769375),
+                                     -5.071259915912691),
+                                    ("Martin Luther King's Dayyear (latent)", -6.052089168924417),
+                                    ("Shemini Atzeretyear (latent)", -6.457554277032581),
+                                    ("daymonth", -4.442651256490317),
+                                    ("monthday", -6.052089168924417),
+                                    ("monthyear", -4.665794807804526),
+                                    ("Yom Ha'atzmautyear (latent)", -6.457554277032581),
+                                    ("Vijayadashamiyear (latent)", -6.457554277032581),
+                                    ("Thai Pongalyear (latent)", -5.764407096472636),
+                                    ("Thiru Onamyear (latent)", -5.764407096472636),
+                                    ("hhhmmabsorption of , after named day", -6.457554277032581),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.54907608489522),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.465366816769375),
-                                    ("Krishna Janmashtamiyear (latent)", -6.059901708661211),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.465366816769375),
-                                    ("houryear", -5.54907608489522),
+                                     -5.541263545158426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.457554277032581),
+                                    ("Krishna Janmashtamiyear (latent)", -6.052089168924417),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.457554277032581),
+                                    ("houryear", -5.541263545158426),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("Christmas<time-of-day> am|pm", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Christmas<time-of-day> am|pm", -6.457554277032581),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("intersectin|during <named-month>|year", -6.465366816769375),
-                                    ("<time-of-day> am|pmintersect", -5.212603848274007),
-                                    ("Earth Houryear (latent)", -6.465366816769375),
-                                    ("Ganesh Chaturthiyear (latent)", -6.465366816769375),
-                                    ("Octoberyear (latent)", -4.961289419993101),
-                                    ("intersect<time-of-day> am|pm", -6.465366816769375),
-                                    ("Mattu Pongalyear (latent)", -6.465366816769375),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.465366816769375),
-                                    ("Shavuotyear (latent)", -6.465366816769375),
-                                    ("Parsi New Yearyear (latent)", -5.54907608489522),
+                                     -5.764407096472636),
+                                    ("intersectin|during <named-month>|year", -6.457554277032581),
+                                    ("<time-of-day> am|pmintersect", -5.204791308537213),
+                                    ("Earth Houryear (latent)", -6.457554277032581),
+                                    ("Ganesh Chaturthiyear (latent)", -6.457554277032581),
+                                    ("Octoberyear (latent)", -4.953476880256307),
+                                    ("intersect<time-of-day> am|pm", -6.457554277032581),
+                                    ("Mattu Pongalyear (latent)", -6.457554277032581),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.457554277032581),
+                                    ("Shavuotyear (latent)", -6.457554277032581),
+                                    ("Parsi New Yearyear (latent)", -5.541263545158426),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.465366816769375),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.465366816769375),
-                                    ("todayin|within|after <duration>", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.457554277032581),
+                                    ("todayin|within|after <duration>", -6.457554277032581),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.059901708661211),
-                                    ("Marchyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Marchyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.059901708661211),
-                                    ("Sukkotyear (latent)", -6.059901708661211),
-                                    ("hhhmmintersect", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Sukkotyear (latent)", -6.052089168924417),
+                                    ("hhhmmintersect", -6.052089168924417),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.059901708661211),
-                                    ("Clean Mondayyear (latent)", -6.059901708661211),
-                                    ("monthhour", -6.059901708661211),
+                                     -6.052089168924417),
+                                    ("Clean Mondayyear (latent)", -6.052089168924417),
+                                    ("monthhour", -6.052089168924417),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.77221963620943),
-                                    ("todayat <time-of-day>", -6.465366816769375),
-                                    ("Thursday<time> timezone", -4.0674715439710045),
-                                    ("tonight<time-of-day> am|pm", -6.465366816769375),
-                                    ("time-of-day (latent)tonight", -6.059901708661211),
-                                    ("from|since|after <time>December", -6.465366816769375),
-                                    ("<time-of-day> am|pmon <day>", -4.45046379622711),
+                                     -5.764407096472636),
+                                    ("todayat <time-of-day>", -6.457554277032581),
+                                    ("Thursday<time> timezone", -4.059659004234211),
+                                    ("tonight<time-of-day> am|pm", -6.457554277032581),
+                                    ("time-of-day (latent)tonight", -6.052089168924417),
+                                    ("from|since|after <time>December", -6.457554277032581),
+                                    ("<time-of-day> am|pmon <day>", -4.442651256490317),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.059901708661211),
-                                    ("dayday", -3.7573166156671647),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.059901708661211),
-                                    ("tonightat <time-of-day>", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.052089168924417),
+                                    ("dayday", -3.7495040759303713),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.052089168924417),
+                                    ("tonightat <time-of-day>", -5.764407096472636),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.465366816769375),
-                                    ("today<time-of-day> am|pm", -6.465366816769375),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.059901708661211),
-                                    ("at <time-of-day><time> <part-of-day>", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)intersect", -6.059901708661211),
-                                    ("hourhour", -3.5749950588732102),
-                                    ("Mahavir Jayantiyear (latent)", -6.059901708661211),
-                                    ("Navaratriin|during <named-month>|year", -6.465366816769375),
-                                    ("Wednesdaythis|last|next <cycle>", -6.465366816769375),
-                                    ("Lentyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("today<time-of-day> am|pm", -6.457554277032581),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.052089168924417),
+                                    ("at <time-of-day><time> <part-of-day>", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)intersect", -6.052089168924417),
+                                    ("hourhour", -3.5671825191364164),
+                                    ("Mahavir Jayantiyear (latent)", -6.052089168924417),
+                                    ("Navaratriin|during <named-month>|year", -6.457554277032581),
+                                    ("Wednesdaythis|last|next <cycle>", -6.457554277032581),
+                                    ("Lentyear (latent)", -6.457554277032581),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.593564639867783),
-                                    ("Boghiyear (latent)", -6.465366816769375),
-                                    ("dayyear", -1.932767323616119),
+                                     -4.58575210013099),
+                                    ("Boghiyear (latent)", -6.457554277032581),
+                                    ("dayyear", -1.9249547838793253),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Thursdayfrom|since|after <time>", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Thursdayfrom|since|after <time>", -6.052089168924417),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Thursdayat <time-of-day>", -5.77221963620943),
-                                    ("Islamic New Yearyear (latent)", -6.059901708661211),
-                                    ("Laylat al-Qadryear (latent)", -5.54907608489522),
-                                    ("part of days<time-of-day> am|pm", -6.465366816769375),
-                                    ("Shrove Tuesdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Thursdayat <time-of-day>", -5.764407096472636),
+                                    ("Islamic New Yearyear (latent)", -6.052089168924417),
+                                    ("Laylat al-Qadryear (latent)", -5.541263545158426),
+                                    ("part of days<time-of-day> am|pm", -6.457554277032581),
+                                    ("Shrove Tuesdayyear (latent)", -6.457554277032581),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.77221963620943),
-                                    ("hourminute", -6.059901708661211),
-                                    ("<time-of-day> am|pmtomorrow", -5.77221963620943),
-                                    ("Yom Kippuryear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)Tuesday", -6.059901708661211),
-                                    ("<part-of-day> of <time>year (latent)", -6.465366816769375),
-                                    ("minutehour", -5.212603848274007),
-                                    ("Kaanum Pongalyear (latent)", -6.059901708661211),
-                                    ("Maha Saptamiyear (latent)", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("hourminute", -6.052089168924417),
+                                    ("<time-of-day> am|pmtomorrow", -5.764407096472636),
+                                    ("Yom Kippuryear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)Tuesday", -6.052089168924417),
+                                    ("<part-of-day> of <time>year (latent)", -6.457554277032581),
+                                    ("minutehour", -5.204791308537213),
+                                    ("Kaanum Pongalyear (latent)", -6.052089168924417),
+                                    ("Maha Saptamiyear (latent)", -6.457554277032581),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("time-of-day (latent)tomorrow", -5.54907608489522),
-                                    ("part of daysat <time-of-day>", -4.855928904335275),
+                                     -5.764407096472636),
+                                    ("time-of-day (latent)tomorrow", -5.541263545158426),
+                                    ("part of daysat <time-of-day>", -4.848116364598481),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.45046379622711),
-                                    ("for <duration> from <time>December", -6.465366816769375),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.465366816769375),
+                                     -4.442651256490317),
+                                    ("for <duration> from <time>December", -6.457554277032581),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.457554277032581),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.212603848274007),
+                                     -5.204791308537213),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.212603848274007),
-                                    ("time-of-day (latent)this <part-of-day>", -6.465366816769375),
-                                    ("Pentecostyear (latent)", -6.465366816769375),
+                                     -5.204791308537213),
+                                    ("time-of-day (latent)this <part-of-day>", -6.457554277032581),
+                                    ("Pentecostyear (latent)", -6.457554277032581),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.212603848274007),
-                                    ("<day-of-month> (ordinal)February", -6.465366816769375),
-                                    ("Eid al-Fitryear (latent)", -5.079072455649484),
+                                     -5.204791308537213),
+                                    ("<day-of-month> (ordinal)February", -6.457554277032581),
+                                    ("Eid al-Fitryear (latent)", -5.071259915912691),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.465366816769375),
-                                    ("Mondayin|during the <part-of-day>", -6.465366816769375),
-                                    ("Chhathin|during <named-month>|year", -6.465366816769375),
-                                    ("Diwaliin|during <named-month>|year", -6.465366816769375),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.465366816769375),
-                                    ("Vaisakhiin|during <named-month>|year", -6.465366816769375),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.212603848274007),
-                                    ("Raksha Bandhanyear (latent)", -6.465366816769375),
-                                    ("daysecond", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Mondayin|during the <part-of-day>", -6.457554277032581),
+                                    ("Chhathin|during <named-month>|year", -6.457554277032581),
+                                    ("Diwaliin|during <named-month>|year", -6.457554277032581),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.457554277032581),
+                                    ("Vaisakhiin|during <named-month>|year", -6.457554277032581),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.204791308537213),
+                                    ("Raksha Bandhanyear (latent)", -6.457554277032581),
+                                    ("daysecond", -6.052089168924417),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.059901708661211),
-                                    ("Ratha-Yatrayear (latent)", -6.465366816769375),
-                                    ("Ashurayear (latent)", -6.465366816769375),
-                                    ("Tuesdayin|during <named-month>|year", -6.465366816769375),
-                                    ("Chinese New Yearyear (latent)", -6.465366816769375),
-                                    ("tomorrowintersect", -6.465366816769375),
-                                    ("Lag BaOmeryear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Ratha-Yatrayear (latent)", -6.457554277032581),
+                                    ("Ashurayear (latent)", -6.457554277032581),
+                                    ("Tuesdayin|during <named-month>|year", -6.457554277032581),
+                                    ("Chinese New Yearyear (latent)", -6.457554277032581),
+                                    ("tomorrowintersect", -6.457554277032581),
+                                    ("Lag BaOmeryear (latent)", -6.457554277032581),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("Eid al-Adhayear (latent)", -4.325300653273104),
-                                    ("intersectin|during the <part-of-day>", -6.465366816769375),
-                                    ("Palm Sundayyear (latent)", -6.465366816769375),
-                                    ("Christmasat <time-of-day>", -6.465366816769375),
-                                    ("Passoveryear (latent)", -6.465366816769375),
-                                    ("Lazarus Saturdayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Eid al-Adhayear (latent)", -4.31748811353631),
+                                    ("intersectin|during the <part-of-day>", -6.457554277032581),
+                                    ("Palm Sundayyear (latent)", -6.457554277032581),
+                                    ("Christmasat <time-of-day>", -6.457554277032581),
+                                    ("Passoveryear (latent)", -6.457554277032581),
+                                    ("Lazarus Saturdayyear (latent)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.465366816769375),
-                                    ("hhhmmon <day>", -5.54907608489522),
-                                    ("Yom HaShoahyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("hhhmmon <day>", -5.541263545158426),
+                                    ("Yom HaShoahyear (latent)", -6.052089168924417),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Septemberyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Septemberyear (latent)", -6.052089168924417),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.961289419993101),
-                                    ("Halloweenyear (latent)", -6.465366816769375),
+                                     -4.953476880256307),
+                                    ("Halloweenyear (latent)", -6.457554277032581),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.77221963620943),
+                                     -5.764407096472636),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.465366816769375),
-                                    ("at <time-of-day>intersect", -5.54907608489522),
-                                    ("Rosh Hashanahyear (latent)", -5.77221963620943),
-                                    ("Dhanterasyear (latent)", -6.465366816769375),
-                                    ("Tu BiShvatyear (latent)", -6.465366816769375),
-                                    ("<day-of-month> (ordinal)December", -5.77221963620943),
-                                    ("Holiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("at <time-of-day>intersect", -5.541263545158426),
+                                    ("Rosh Hashanahyear (latent)", -5.764407096472636),
+                                    ("Dhanterasyear (latent)", -6.457554277032581),
+                                    ("Tu BiShvatyear (latent)", -6.457554277032581),
+                                    ("<day-of-month> (ordinal)December", -5.764407096472636),
+                                    ("Holiyear (latent)", -5.764407096472636),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Holika Dahanyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("Holika Dahanyear (latent)", -5.764407096472636),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.059901708661211),
-                                    ("dayminute", -3.1511808120968494),
-                                    ("Mawlidyear (latent)", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("dayminute", -3.1433682723600556),
+                                    ("Mawlidyear (latent)", -6.457554277032581),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.059901708661211),
+                                     -6.052089168924417),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.465366816769375),
-                                    ("Jumu'atul-Widayear (latent)", -5.54907608489522),
-                                    ("minuteday", -2.658704326999055),
-                                    ("absorption of , after named dayintersect", -5.77221963620943),
-                                    ("intersectyear (latent)", -6.465366816769375),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Jumu'atul-Widayear (latent)", -5.541263545158426),
+                                    ("minuteday", -2.719884658749213),
+                                    ("absorption of , after named dayintersect",
+                                     -5.764407096472636),
+                                    ("intersectyear (latent)", -6.457554277032581),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.457554277032581),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
-                                    ("intersecthhhmm", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("intersecthhhmm", -6.052089168924417),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Boss's Dayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Boss's Dayyear (latent)", -6.052089168924417),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.465366816769375),
-                                    ("Global Youth Service Dayyear (latent)", -6.465366816769375),
-                                    ("Dhanterasin|during <named-month>|year", -6.465366816769375),
-                                    ("Tisha B'Avyear (latent)", -6.465366816769375),
-                                    ("Isra and Mi'rajyear (latent)", -5.54907608489522),
-                                    ("at <time-of-day>on <day>", -4.855928904335275),
+                                     -6.457554277032581),
+                                    ("Global Youth Service Dayyear (latent)", -6.457554277032581),
+                                    ("Dhanterasin|during <named-month>|year", -6.457554277032581),
+                                    ("Tisha B'Avyear (latent)", -6.457554277032581),
+                                    ("Isra and Mi'rajyear (latent)", -5.541263545158426),
+                                    ("at <time-of-day>on <day>", -4.848116364598481),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.059901708661211),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.77221963620943),
-                                    ("Christmasyear (latent)", -6.059901708661211),
-                                    ("Saturdayintersect", -6.465366816769375),
-                                    ("Naraka Chaturdashiyear (latent)", -6.059901708661211),
-                                    ("Thai Pongalin|during <named-month>|year", -6.465366816769375),
-                                    ("dayweek", -6.465366816769375),
-                                    ("Easter Sundayyear (latent)", -5.77221963620943),
+                                     -6.052089168924417),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.764407096472636),
+                                    ("Christmasyear (latent)", -6.052089168924417),
+                                    ("Saturdayintersect", -6.457554277032581),
+                                    ("Naraka Chaturdashiyear (latent)", -6.052089168924417),
+                                    ("Thai Pongalin|during <named-month>|year", -6.457554277032581),
+                                    ("dayweek", -6.457554277032581),
+                                    ("Easter Sundayyear (latent)", -5.764407096472636),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -5.366754528101265),
-                                    ("weekyear", -5.366754528101265),
-                                    ("King's Dayyear (latent)", -4.961289419993101),
-                                    ("hh:mmin|during the <part-of-day>", -5.54907608489522),
+                                     -6.052089168924417),
+                                    ("weekyear", -5.358941988364472),
+                                    ("King's Dayyear (latent)", -4.953476880256307),
+                                    ("hh:mmin|during the <part-of-day>", -5.541263545158426),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.059901708661211),
-                                    ("Hanukkahyear (latent)", -5.77221963620943),
-                                    ("Rama Navamiyear (latent)", -6.465366816769375),
-                                    ("February<time> <part-of-day>", -6.465366816769375),
+                                     -6.052089168924417),
+                                    ("Hanukkahyear (latent)", -5.764407096472636),
+                                    ("Rama Navamiyear (latent)", -6.457554277032581),
+                                    ("February<time> <part-of-day>", -6.457554277032581),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.77221963620943),
-                                    ("Great Lentyear (latent)", -6.465366816769375),
-                                    ("tomorrowat <time-of-day>", -5.77221963620943),
+                                     -5.764407096472636),
+                                    ("Great Lentyear (latent)", -6.457554277032581),
+                                    ("tomorrowat <time-of-day>", -5.764407096472636),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.059901708661211),
-                                    ("Ugadiyear (latent)", -5.079072455649484),
-                                    ("Vaisakhiyear (latent)", -5.77221963620943),
+                                     -6.457554277032581),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.052089168924417),
+                                    ("Ugadiyear (latent)", -5.071259915912691),
+                                    ("Vaisakhiyear (latent)", -5.764407096472636),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.77221963620943),
-                                    ("last <cycle> of <time>year (latent)", -5.77221963620943),
-                                    ("at <time-of-day>tomorrow", -6.059901708661211),
-                                    ("tomorrow<time-of-day> am|pm", -6.465366816769375),
+                                     -5.764407096472636),
+                                    ("last <cycle> of <time>year (latent)", -5.764407096472636),
+                                    ("at <time-of-day>tomorrow", -6.052089168924417),
+                                    ("tomorrow<time-of-day> am|pm", -6.457554277032581),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.465366816769375),
-                                    ("Diwaliyear (latent)", -6.465366816769375),
-                                    ("between <time> and <time>on <day>", -5.366754528101265),
-                                    ("Black Fridayyear (latent)", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Diwaliyear (latent)", -6.457554277032581),
+                                    ("between <time> and <time>on <day>", -6.052089168924417),
+                                    ("Black Fridayyear (latent)", -6.052089168924417),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.465366816769375),
+                                     -6.457554277032581),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.465366816769375),
-                                    ("Chhathyear (latent)", -6.059901708661211),
-                                    ("Vasant Panchamiyear (latent)", -6.465366816769375),
-                                    ("Rabindra Jayantiyear (latent)", -5.212603848274007),
-                                    ("this <part-of-day>at <time-of-day>", -5.212603848274007),
-                                    ("St Patrick's Dayyear (latent)", -6.465366816769375),
-                                    ("Thursday<time> (timezone)", -6.465366816769375),
+                                     -6.457554277032581),
+                                    ("Chhathyear (latent)", -6.052089168924417),
+                                    ("Vasant Panchamiyear (latent)", -6.457554277032581),
+                                    ("Rabindra Jayantiyear (latent)", -5.204791308537213),
+                                    ("this <part-of-day>at <time-of-day>", -5.204791308537213),
+                                    ("St Patrick's Dayyear (latent)", -6.457554277032581),
+                                    ("Thursday<time> (timezone)", -6.457554277032581),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.465366816769375),
-                                    ("Pargat Diwasyear (latent)", -5.212603848274007),
-                                    ("<datetime> - <datetime> (interval)July", -6.059901708661211),
+                                     -6.457554277032581),
+                                    ("Pargat Diwasyear (latent)", -5.204791308537213),
+                                    ("<datetime> - <datetime> (interval)July", -6.052089168924417),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.77221963620943),
-                                    ("Februaryintersect", -6.465366816769375),
-                                    ("Simchat Torahyear (latent)", -6.465366816769375),
-                                    ("minuteyear", -6.465366816769375)],
-                               n = 497},
+                                     -5.764407096472636),
+                                    ("Februaryintersect", -6.457554277032581),
+                                    ("Simchat Torahyear (latent)", -6.457554277032581),
+                                    ("minuteyear", -6.457554277032581)],
+                               n = 491},
                    koData =
-                     ClassData{prior = -1.0005301043167745, unseen = -6.76849321164863,
+                     ClassData{prior = -0.9906942268591662, unseen = -6.773080375655535,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.570118547929173),
-                                    ("hourday", -3.548467300397191),
+                                   [("Thursdayhhhmm", -4.574710978503383),
+                                    ("hourday", -3.6808931024812863),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)August", -6.074195944705447),
-                                    ("dayhour", -3.50924658724391),
-                                    ("<time> timezoneyear (latent)", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)August", -6.0787883752796565),
+                                    ("dayhour", -3.5138390178181202),
+                                    ("<time> timezoneyear (latent)", -5.385641194719711),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.157905212831292),
-                                    ("Tuesdayfrom|since|after <time>", -5.381048764145501),
-                                    ("daymonth", -3.400047295278918),
-                                    ("monthyear", -4.821432976210079),
-                                    ("<time-of-day> am|pmyear (latent)", -5.381048764145501),
-                                    ("Thai Pongalyear (latent)", -5.381048764145501),
-                                    ("intersecthh:mm", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Tuesdayfrom|since|after <time>", -5.385641194719711),
+                                    ("daymonth", -3.4046397258531282),
+                                    ("monthyear", -4.826025406784289),
+                                    ("<time-of-day> am|pmyear (latent)", -5.385641194719711),
+                                    ("Thai Pongalyear (latent)", -5.385641194719711),
+                                    ("intersecthh:mm", -6.0787883752796565),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.668730836597282),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.074195944705447),
-                                    ("houryear", -4.687901583585556),
+                                     -5.673323267171493),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.0787883752796565),
+                                    ("houryear", -4.692494014159767),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)October", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)October", -6.0787883752796565),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.381048764145501),
-                                    ("hournograin", -4.821432976210079),
-                                    ("<time-of-day> am|pmintersect", -4.821432976210079),
-                                    ("Octoberyear (latent)", -6.074195944705447),
+                                     -5.385641194719711),
+                                    ("hournograin", -4.826025406784289),
+                                    ("<time-of-day> am|pmintersect", -4.826025406784289),
+                                    ("Octoberyear (latent)", -6.0787883752796565),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("early morningat <time-of-day>", -6.074195944705447),
-                                    ("until <time>on <day>", -5.381048764145501),
+                                     -5.673323267171493),
+                                    ("early morningat <time-of-day>", -6.0787883752796565),
+                                    ("until <time>on <day>", -5.385641194719711),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)intersect", -5.381048764145501),
-                                    ("todayin <number> (implicit minutes)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)intersect", -5.385641194719711),
+                                    ("todayin <number> (implicit minutes)", -6.0787883752796565),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.381048764145501),
+                                     -5.385641194719711),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -6.074195944705447),
-                                    ("hh:mmon <day>", -4.464758032271346),
-                                    ("hhhmmintersect", -5.668730836597282),
-                                    ("absorption of , after named dayJuly", -5.157905212831292),
-                                    ("from|since|after <time>July", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("hh:mmon <day>", -4.826025406784289),
+                                    ("hhhmmintersect", -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.162497643405502),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.157905212831292),
-                                    ("Clean Mondayyear (latent)", -6.074195944705447),
-                                    ("monthhour", -6.074195944705447),
+                                     -5.162497643405502),
+                                    ("Clean Mondayyear (latent)", -6.0787883752796565),
+                                    ("monthhour", -6.0787883752796565),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("hourmonth", -4.202393767803855),
-                                    ("todayat <time-of-day>", -6.074195944705447),
-                                    ("hhhmmyear (latent)", -4.821432976210079),
-                                    ("from|since|after <time>December", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("hourmonth", -4.206986198378066),
+                                    ("todayat <time-of-day>", -6.0787883752796565),
+                                    ("hhhmmyear (latent)", -4.826025406784289),
+                                    ("from|since|after <time>December", -6.0787883752796565),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.074195944705447),
-                                    ("<time-of-day> am|pmon <day>", -4.821432976210079),
-                                    ("Mondayyear (latent)", -5.381048764145501),
-                                    ("dayday", -4.687901583585556),
-                                    ("on <day>September", -5.381048764145501),
-                                    ("time-of-day (latent)September", -5.668730836597282),
-                                    ("hourhour", -3.9947544030256106),
-                                    ("time-of-day (latent)on <day>", -4.282436475477391),
+                                     -6.0787883752796565),
+                                    ("<time-of-day> am|pmon <day>", -4.826025406784289),
+                                    ("Mondayyear (latent)", -5.385641194719711),
+                                    ("dayday", -4.063885354737392),
+                                    ("on <day>September", -5.385641194719711),
+                                    ("time-of-day (latent)September", -5.673323267171493),
+                                    ("hourhour", -3.999346833599821),
+                                    ("time-of-day (latent)on <day>", -4.574710978503383),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.668730836597282),
-                                    ("dayyear", -3.156425212621168),
-                                    ("Thursdaymm/dd", -6.074195944705447),
-                                    ("New Year's Dayyear (latent)", -5.157905212831292),
-                                    ("time-of-day (latent)Sunday", -5.668730836597282),
-                                    ("Thursdayfrom|since|after <time>", -4.3694478524670215),
-                                    ("Thursdayat <time-of-day>", -4.464758032271346),
+                                     -5.673323267171493),
+                                    ("dayyear", -3.1610176431953776),
+                                    ("Thursdaymm/dd", -6.0787883752796565),
+                                    ("New Year's Dayyear (latent)", -5.162497643405502),
+                                    ("time-of-day (latent)Sunday", -5.673323267171493),
+                                    ("Thursdayfrom|since|after <time>", -4.374040283041231),
+                                    ("Thursdayat <time-of-day>", -4.469350462845557),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.074195944705447),
-                                    ("Aprilyear (latent)", -6.074195944705447),
-                                    ("the <day-of-month> (ordinal)July", -6.074195944705447),
-                                    ("the <day-of-month> (number)July", -6.074195944705447),
-                                    ("monthminute", -6.074195944705447),
-                                    ("<time-of-day> am|pmtomorrow", -6.074195944705447),
-                                    ("Thursdayhh:mm", -5.157905212831292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.668730836597282),
-                                    ("minutemonth", -3.934129781209176),
-                                    ("time-of-day (latent)Friday", -5.668730836597282),
-                                    ("minutehour", -6.074195944705447),
-                                    ("part of daysat <time-of-day>", -4.975583656037337),
-                                    ("Augustyear (latent)", -5.668730836597282),
-                                    ("week-endin|during <named-month>|year", -6.074195944705447),
-                                    ("time-of-day (latent)Tuesday", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("Aprilyear (latent)", -6.0787883752796565),
+                                    ("the <day-of-month> (ordinal)July", -6.0787883752796565),
+                                    ("the <day-of-month> (number)July", -6.0787883752796565),
+                                    ("monthminute", -6.0787883752796565),
+                                    ("<time-of-day> am|pmtomorrow", -6.0787883752796565),
+                                    ("Thursdayhh:mm", -5.162497643405502),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.673323267171493),
+                                    ("minutemonth", -3.938722211783386),
+                                    ("time-of-day (latent)Friday", -5.673323267171493),
+                                    ("minutehour", -6.0787883752796565),
+                                    ("part of daysat <time-of-day>", -4.980176086611547),
+                                    ("Augustyear (latent)", -5.673323267171493),
+                                    ("week-endin|during <named-month>|year", -6.0787883752796565),
+                                    ("time-of-day (latent)Tuesday", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
-                                    ("Sundayyear (latent)", -5.157905212831292),
-                                    ("Christmasat <time-of-day>", -6.074195944705447),
-                                    ("from|since|after <time>year (latent)", -4.975583656037337),
-                                    ("hhhmmon <day>", -5.157905212831292),
-                                    ("yesterday<time-of-day> am|pm", -6.074195944705447),
-                                    ("<day-of-month> (ordinal)July", -5.381048764145501),
+                                     -6.0787883752796565),
+                                    ("Sundayyear (latent)", -5.162497643405502),
+                                    ("the <day-of-month> (ordinal)Monday", -5.385641194719711),
+                                    ("Christmasat <time-of-day>", -6.0787883752796565),
+                                    ("from|since|after <time>year (latent)", -4.980176086611547),
+                                    ("hhhmmon <day>", -5.162497643405502),
+                                    ("yesterday<time-of-day> am|pm", -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)July", -5.385641194719711),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.074195944705447),
+                                     -6.0787883752796565),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>intersect", -5.157905212831292),
-                                    ("hh:mmyear (latent)", -4.687901583585556),
-                                    ("Holiyear (latent)", -6.074195944705447),
-                                    ("until <time><time-of-day> am|pm", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("at <time-of-day>intersect", -5.162497643405502),
+                                    ("hh:mmyear (latent)", -4.692494014159767),
+                                    ("Holiyear (latent)", -6.0787883752796565),
+                                    ("until <time><time-of-day> am|pm", -6.0787883752796565),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.668730836597282),
-                                    ("dayminute", -3.2409826006492306),
-                                    ("yyyy-mm-ddhh:mm", -5.668730836597282),
-                                    ("intersectfrom|since|after <time>", -5.668730836597282),
-                                    ("intersectSeptember", -4.202393767803855),
-                                    ("minuteday", -2.855320119837246),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.245575031223441),
+                                    ("yyyy-mm-ddhh:mm", -5.673323267171493),
+                                    ("intersectfrom|since|after <time>", -5.673323267171493),
+                                    ("intersectSeptember", -4.206986198378066),
+                                    ("minuteday", -2.9217879541295435),
                                     ("absorption of , after named dayintersect",
-                                     -6.074195944705447),
-                                    ("intersectyear (latent)", -6.074195944705447),
-                                    ("Februaryin|during the <part-of-day>", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("intersectyear (latent)", -6.0787883752796565),
+                                    ("Februaryin|during the <part-of-day>", -6.0787883752796565),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.074195944705447),
-                                    ("time-of-day (latent)July", -5.381048764145501),
-                                    ("Saturdayyear (latent)", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("time-of-day (latent)July", -5.385641194719711),
+                                    ("Saturdayyear (latent)", -6.0787883752796565),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.074195944705447),
-                                    ("at <time-of-day>on <day>", -5.157905212831292),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)Monday", -5.162497643405502),
+                                    ("at <time-of-day>on <day>", -5.162497643405502),
                                     ("absorption of , after named daySeptember",
-                                     -4.821432976210079),
-                                    ("Naraka Chaturdashiyear (latent)", -6.074195944705447),
-                                    ("from|since|after <time>on <day>", -5.157905212831292),
-                                    ("dayweek", -6.074195944705447),
-                                    ("Easter Sundayyear (latent)", -5.668730836597282),
-                                    ("Thursday<time-of-day> am|pm", -4.821432976210079),
-                                    ("weekyear", -5.668730836597282),
-                                    ("time-of-day (latent)Thursday", -5.668730836597282),
+                                     -4.826025406784289),
+                                    ("Naraka Chaturdashiyear (latent)", -6.0787883752796565),
+                                    ("from|since|after <time>on <day>", -5.162497643405502),
+                                    ("dayweek", -6.0787883752796565),
+                                    ("Easter Sundayyear (latent)", -5.673323267171493),
+                                    ("Thursday<time-of-day> am|pm", -4.826025406784289),
+                                    ("weekyear", -5.673323267171493),
+                                    ("time-of-day (latent)Thursday", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.074195944705447),
-                                    ("<day-of-month> (ordinal)April", -6.074195944705447),
+                                     -6.0787883752796565),
+                                    ("<day-of-month> (ordinal)April", -6.0787883752796565),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.381048764145501),
-                                    ("Sundayfrom|since|after <time>", -6.074195944705447),
-                                    ("absorption of , after named dayFebruary", -5.157905212831292),
+                                     -5.385641194719711),
+                                    ("Sundayfrom|since|after <time>", -6.0787883752796565),
+                                    ("absorption of , after named dayFebruary", -5.162497643405502),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.668730836597282),
+                                     -5.673323267171493),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.074195944705447),
-                                    ("tomorrowat <time-of-day>", -6.074195944705447),
-                                    ("daynograin", -5.668730836597282),
+                                     -6.0787883752796565),
+                                    ("tomorrowat <time-of-day>", -6.0787883752796565),
+                                    ("daynograin", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.668730836597282),
-                                    ("last <cycle> of <time>year (latent)", -5.668730836597282),
-                                    ("tomorrow<time-of-day> am|pm", -6.074195944705447),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.673323267171493),
+                                    ("tomorrow<time-of-day> am|pm", -6.0787883752796565),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.381048764145501),
-                                    ("Diwaliyear (latent)", -5.668730836597282),
+                                     -5.385641194719711),
+                                    ("Diwaliyear (latent)", -5.673323267171493),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.074195944705447),
-                                    ("this <part-of-day>at <time-of-day>", -5.157905212831292),
-                                    ("Fridayyear (latent)", -5.668730836597282),
-                                    ("time-of-day (latent)April", -6.074195944705447),
-                                    ("minuteyear", -3.876971367369227)],
-                               n = 289}}),
+                                     -6.0787883752796565),
+                                    ("this <part-of-day>at <time-of-day>", -5.162497643405502),
+                                    ("Fridayyear (latent)", -5.673323267171493),
+                                    ("time-of-day (latent)April", -6.0787883752796565),
+                                    ("minuteyear", -3.8815637979434374)],
+                               n = 290}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1431,8 +1448,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 29},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1701,10 +1718,10 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Monday",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157, unseen = -2.639057329615259,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                     ClassData{prior = -0.2719337154836418, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
-                     ClassData{prior = -1.2237754316221157,
+                     ClassData{prior = -1.4350845252893227,
                                unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("dd/mm/yyyy",
@@ -1784,27 +1801,28 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.9808292530117262),
+                                   [("daymonth", -0.916290731874155),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.0794415416798357),
+                                     -2.5257286443082556),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -1.6739764335716716),
+                                     -2.120263536200091),
+                                    ("ordinals (first..twentieth,thirtieth,...)Mondaythis|last|next <cycle>",
+                                     -1.6094379124341003),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -1.6739764335716716)],
-                               n = 5},
+                                     -2.120263536200091)],
+                               n = 9},
                    koData =
-                     ClassData{prior = -0.9808292530117262,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.0986122886681098),
+                                   [("daymonth", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -1.791759469228055),
+                                     -1.8718021769015913),
                                     ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -1.3862943611198906)],
+                                     -1.466337068793427)],
                                n = 3}}),
        ("half a <time-grain>",
         Classifier{okData =
@@ -1875,12 +1893,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -3.822121282019774e-2,
+                     ClassData{prior = -5.0643732818754915e-2,
                                unseen = -4.3694478524670215,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 77},
                    koData =
-                     ClassData{prior = -3.283414346005772, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -3.0081547935525483, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -2090,28 +2108,31 @@ classifiers
                                n = 1}}),
        ("this|last|next <cycle>",
         Classifier{okData =
-                     ClassData{prior = -0.15984870094189602,
-                               unseen = -5.081404364984463,
+                     ClassData{prior = -0.24201203561859258,
+                               unseen = -5.198497031265826,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.104881901681705),
-                                    ("month (grain)", -2.772588722239781),
-                                    ("year (grain)", -2.6772785424354564),
-                                    ("week (grain)", -1.104881901681705),
-                                    ("quarter", -3.4657359027997265), ("year", -2.6772785424354564),
-                                    ("month", -2.772588722239781),
-                                    ("quarter (grain)", -3.4657359027997265)],
-                               n = 75},
+                                   [("week", -1.2226649373380885),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.4849066497880004),
+                                    ("week (grain)", -1.2226649373380885),
+                                    ("quarter", -3.58351893845611), ("year", -2.4849066497880004),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -3.58351893845611)],
+                               n = 84},
                    koData =
-                     ClassData{prior = -1.9123874570166697,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -1.5373346185327565, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.2809338454620642),
-                                    ("week (grain)", -1.2809338454620642),
-                                    ("day", -1.9740810260220096),
-                                    ("day (grain)", -1.9740810260220096)],
-                               n = 13}}),
+                                   [("week", -1.4954936530848826),
+                                    ("month (grain)", -2.451005098112319),
+                                    ("second", -3.367295829986474),
+                                    ("week (grain)", -1.4954936530848826),
+                                    ("day", -2.114532861491106),
+                                    ("second (grain) ", -3.367295829986474),
+                                    ("month", -2.451005098112319),
+                                    ("day (grain)", -2.114532861491106)],
+                               n = 23}}),
        ("Simchat Torah",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2189,7 +2210,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295, unseen = -2.995732273553991,
+                     ClassData{prior = -0.46262352194811296,
+                               unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
@@ -2197,14 +2219,14 @@ classifiers
                                     ("ordinal (digits)", -0.11122563511022437)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.9932517730102834,
+                               unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0986122886681098),
-                                    ("ordinal (digits)", -0.40546510810816444)],
-                               n = 7}}),
+                                     -0.6931471805599453),
+                                    ("ordinal (digits)", -0.6931471805599453)],
+                               n = 10}}),
        ("last weekend of <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -2304,19 +2326,20 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.6397464038328301, unseen = -4.852030263919617,
+                     ClassData{prior = -0.6141039732194924, unseen = -4.852030263919617,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -9.925495809534127e-2),
                                     ("integer (0..19)", -2.359280436670591)],
                                n = 125},
                    koData =
-                     ClassData{prior = -0.7495612698400367, unseen = -4.74493212836325,
+                     ClassData{prior = -0.7789786164097264,
+                               unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.275935428242832e-2),
-                                    ("integer (0..19)", -2.6567569067146595)],
-                               n = 112}}),
+                                   [("integer (numeric)", -7.696104113612832e-2),
+                                    ("integer (0..19)", -2.6026896854443837)],
+                               n = 106}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2447,20 +2470,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <day>",
         Classifier{okData =
-                     ClassData{prior = -0.2006706954621511, unseen = -4.143134726391533,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.04305126783455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursday", -1.6422277352570913),
-                                    ("absorption of , after named day", -2.740840023925201),
-                                    ("intersect", -2.740840023925201),
-                                    ("Saturday", -2.740840023925201),
-                                    ("Friday", -3.028522096376982), ("day", -0.7949298748698876),
-                                    ("the <day-of-month> (ordinal)", -3.028522096376982),
+                                   [("Thursday", -1.8281271133989299),
+                                    ("absorption of , after named day", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("Saturday", -2.639057329615259),
+                                    ("Friday", -2.9267394020670396), ("day", -0.8064758658669484),
+                                    ("the <day-of-month> (ordinal)", -2.9267394020670396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -2.740840023925201)],
-                               n = 27},
+                                     -2.639057329615259)],
+                               n = 24},
                    koData =
-                     ClassData{prior = -1.7047480922384253, unseen = -3.044522437723423,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect", -1.6094379124341003),
@@ -2528,15 +2551,21 @@ classifiers
                                n = 16}}),
        ("at the beginning|end of <year>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year (latent)", -0.6931471805599453),
-                                    ("year", -0.6931471805599453)],
-                               n = 4},
+                                   [("year (latent)", -1.2237754316221157),
+                                    ("this|last|next <cycle>", -1.4469189829363254),
+                                    ("year", -0.7537718023763802)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -2.0794415416798357, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("this|last|next <cycle>", -0.916290731874155),
+                                    ("year", -0.916290731874155)],
+                               n = 1}}),
        ("Dhanteras",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2560,12 +2589,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.11332868530700312,
-                               unseen = -4.343805421853684,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 75},
+                     ClassData{prior = -0.12260232209233239,
+                               unseen = -4.2626798770413155,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 69},
                    koData =
-                     ClassData{prior = -2.2335922215070942,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -2.159484249353372, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
        ("Holi",
         Classifier{okData =
@@ -2610,18 +2638,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("ordinals (first..twentieth,thirtieth,...)",
         Classifier{okData =
-                     ClassData{prior = -5.406722127027582e-2,
-                               unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -4.445176257083381e-2,
+                               unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
-                     ClassData{prior = -2.9444389791664407,
+                     ClassData{prior = -3.1354942159291497,
                                unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Mawlid",
@@ -2802,66 +2832,66 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.5993284253422904, unseen = -5.313205979041787,
+                     ClassData{prior = -0.5861750610077776, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayhour", -4.209655408733095),
-                                    ("daymonth", -2.2637452596777816),
+                                     -4.634728988229636),
+                                    ("dayhour", -4.229263880121471),
+                                    ("daymonth", -2.192381952860431),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.61512051684126),
+                                     -4.634728988229636),
                                     ("Friday<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("Wednesdayintersect", -4.61512051684126),
+                                     -3.381966019734268),
+                                    ("Wednesdayintersect", -4.634728988229636),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -3.228826155721369),
-                                    ("Black Fridaythis|last|next <cycle>", -4.61512051684126),
-                                    ("<part-of-day> of <time>February", -4.61512051684126),
-                                    ("Saturday<time-of-day> am|pm", -4.61512051684126),
+                                     -3.248434627109745),
+                                    ("Black Fridaythis|last|next <cycle>", -4.634728988229636),
+                                    ("<part-of-day> of <time>February", -4.634728988229636),
+                                    ("Saturday<time-of-day> am|pm", -4.634728988229636),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.209655408733095),
-                                    ("hourmonth", -4.61512051684126),
+                                     -4.229263880121471),
+                                    ("hourmonth", -4.634728988229636),
                                     ("Fridayintersect by \",\", \"of\", \"from\" for year",
-                                     -3.9219733362813143),
-                                    ("dayday", -2.3638287182347644),
-                                    ("the <day-of-month> (ordinal)February", -4.209655408733095),
-                                    ("WednesdayOctober", -4.61512051684126),
-                                    ("Wednesdaythis|last|next <cycle>", -4.209655408733095),
+                                     -3.9415818076696905),
+                                    ("dayday", -2.3834371896231406),
+                                    ("the <day-of-month> (ordinal)February", -4.229263880121471),
+                                    ("WednesdayOctober", -4.634728988229636),
+                                    ("Wednesdaythis|last|next <cycle>", -4.229263880121471),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.362357548345891),
-                                    ("dayyear", -3.9219733362813143),
+                                     -3.381966019734268),
+                                    ("dayyear", -3.9415818076696905),
                                     ("Saturday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("Thursdayhh:mm", -4.209655408733095),
-                                    ("TuesdayOctober", -4.61512051684126),
-                                    ("the <day-of-month> (ordinal)March", -4.61512051684126),
-                                    ("Mondaythis|last|next <cycle>", -4.61512051684126),
-                                    ("Fridayintersect", -3.9219733362813143),
+                                     -4.634728988229636),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("TuesdayOctober", -4.634728988229636),
+                                    ("the <day-of-month> (ordinal)March", -4.634728988229636),
+                                    ("Mondaythis|last|next <cycle>", -3.9415818076696905),
+                                    ("Fridayintersect", -3.9415818076696905),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -4.209655408733095),
-                                    ("intersectOctober", -4.209655408733095),
+                                     -4.229263880121471),
+                                    ("intersectOctober", -4.229263880121471),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.698829784967104),
-                                    ("Tuesdaythis|last|next <cycle>", -4.61512051684126),
+                                     -3.7184382563554808),
+                                    ("Tuesdaythis|last|next <cycle>", -4.634728988229636),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.61512051684126),
-                                    ("dayminute", -2.8233610476132043),
-                                    ("minuteday", -3.362357548345891),
-                                    ("this|last|next <cycle>Sunday", -4.61512051684126),
-                                    ("Sundaythis|last|next <cycle>", -4.61512051684126),
-                                    ("on <day><time-of-day> am|pm", -4.61512051684126),
-                                    ("intersectintersect", -4.61512051684126),
-                                    ("weekday", -4.61512051684126),
-                                    ("dayweek", -3.5165082281731497),
+                                     -4.634728988229636),
+                                    ("dayminute", -2.842969519001581),
+                                    ("minuteday", -3.381966019734268),
+                                    ("this|last|next <cycle>Sunday", -4.634728988229636),
+                                    ("Sundaythis|last|next <cycle>", -4.634728988229636),
+                                    ("on <day><time-of-day> am|pm", -4.634728988229636),
+                                    ("intersectintersect", -4.634728988229636),
+                                    ("weekday", -4.634728988229636),
+                                    ("dayweek", -3.536116699561526),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -4.209655408733095),
-                                    ("<datetime> - <datetime> (interval)July", -3.698829784967104),
+                                     -4.229263880121471),
+                                    ("<datetime> - <datetime> (interval)July", -3.7184382563554808),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -3.9219733362813143)],
-                               n = 67},
+                                     -3.9415818076696905)],
+                               n = 69},
                    koData =
-                     ClassData{prior = -0.7966878595007857, unseen = -5.187385805840755,
+                     ClassData{prior = -0.812948380372566, unseen = -5.187385805840755,
                                likelihoods =
                                  HashMap.fromList
                                    [("week-endJuly", -4.48863636973214),
@@ -2967,7 +2997,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4462871026284195,
+                     ClassData{prior = -0.5947071077466928,
                                unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
@@ -2976,14 +3006,13 @@ classifiers
                                     ("ordinal (digits)", -0.25131442828090605)],
                                n = 16},
                    koData =
-                     ClassData{prior = -1.0216512475319814,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8023464725249373, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (first..twentieth,thirtieth,...)",
-                                     -1.0116009116784799),
-                                    ("ordinal (digits)", -0.45198512374305727)],
-                               n = 9}}),
+                                     -0.6286086594223742),
+                                    ("ordinal (digits)", -0.7621400520468967)],
+                               n = 13}}),
        ("<time> (timezone)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -3175,14 +3204,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("by the end of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this|last|next <cycle>", -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
+                                   [("this|last|next <cycle>", -0.8109302162163288),
+                                    ("year", -1.5040773967762742), ("month", -1.0986122886681098)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("half an hour (abbrev).",
         Classifier{okData =
@@ -3672,31 +3701,31 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time> and <time>",
         Classifier{okData =
-                     ClassData{prior = -0.8873031950009028,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.3862943611198906),
-                                    ("hh:mmhh:mm", -1.5686159179138452),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -2.1972245773362196),
                                     ("<time-of-day> am|pmtime-of-day (latent)",
-                                     -2.4849066497880004),
-                                    ("hhhmmhhhmm", -2.4849066497880004),
-                                    ("minutehour", -2.0794415416798357),
+                                     -2.1972245773362196),
+                                    ("hhhmmhhhmm", -2.1972245773362196),
+                                    ("minutehour", -1.791759469228055),
                                     ("<time-of-day> am|pm<time-of-day> am|pm",
-                                     -2.4849066497880004)],
-                               n = 7},
+                                     -2.1972245773362196)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -0.5306282510621704,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hhhmmintersect", -2.70805020110221),
-                                    ("minuteminute", -1.6094379124341003),
-                                    ("minutehour", -1.6094379124341003),
-                                    ("hh:mmintersect", -1.791759469228055),
-                                    ("hhhmmtime-of-day (latent)", -2.70805020110221)],
-                               n = 10}}),
+                                   [("hh:mmtime-of-day (latent)", -2.1972245773362196),
+                                    ("hhhmmintersect", -2.1972245773362196),
+                                    ("minuteminute", -1.791759469228055),
+                                    ("minutehour", -1.791759469228055),
+                                    ("hh:mmintersect", -2.1972245773362196),
+                                    ("hhhmmtime-of-day (latent)", -2.1972245773362196)],
+                               n = 4}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.4657359027997265,
diff --git a/Duckling/Time/EN/Corpus.hs b/Duckling/Time/EN/Corpus.hs
index dd676c1a..fb78fb14 100644
--- a/Duckling/Time/EN/Corpus.hs
+++ b/Duckling/Time/EN/Corpus.hs
@@ -744,6 +744,12 @@ allExamples = concat
   , examples (datetime (2012, 11, 12, 0, 0, 0) Day)
              [ "three months ago"
              ]
+  , examples (datetime (2013, 02, 04, 0, 0, 0) Day)
+             [ "the first Monday of this month"
+             , "the first Monday of the month"
+             , "the first Monday in this month"
+             , "first Monday in the month"
+             ]
   , examples (datetime (2011, 2, 1, 0, 0, 0) Month)
              [ "two years ago"
              ]
diff --git a/Duckling/Time/EN/Rules.hs b/Duckling/Time/EN/Rules.hs
index f0fa9042..2e654c20 100644
--- a/Duckling/Time/EN/Rules.hs
+++ b/Duckling/Time/EN/Rules.hs
@@ -1961,7 +1961,7 @@ ruleCycleThisLastNext :: Rule
 ruleCycleThisLastNext = Rule
   { name = "this|last|next <cycle>"
   , pattern =
-    [ regex "(this|current|coming|next|the following|last|past|previous)"
+    [ regex "(this|current|coming|next|(the( following)?)|last|past|previous)"
     , dimension TimeGrain
     ]
   , prod = \tokens -> case tokens of
@@ -1975,6 +1975,7 @@ ruleCycleThisLastNext = Rule
           "previous"      -> tt . cycleNth grain $ - 1
           "next"          -> tt $ cycleNth grain 1
           "the following" -> tt $ cycleNth grain 1
+          "the"           -> tt $ cycleNth grain 0
           _ -> Nothing
       _ -> Nothing
   }
diff --git a/Duckling/Time/Helpers.hs b/Duckling/Time/Helpers.hs
index 63160282..c27d36f7 100644
--- a/Duckling/Time/Helpers.hs
+++ b/Duckling/Time/Helpers.hs
@@ -25,7 +25,7 @@ module Duckling.Time.Helpers
   , predNth, predNthAfter, predNthClosest, season, second, timeOfDayAMPM
   , weekday, weekend, workweek, withDirection, year, yearMonthDay, tt, durationIntervalAgo
   , inDurationInterval, intersectWithReplacement, yearADBC, yearMonth
-  , predEveryNDaysFrom
+  , predEveryNDaysFrom, timeCycle
     -- Other
   , getIntValue, timeComputed, toTimeObjectM
   -- Rule constructors