diff --git a/Duckling/Ranking/Classifiers/EN_AU.hs b/Duckling/Ranking/Classifiers/EN_AU.hs
index 986b64a6..7a06edfb 100644
--- a/Duckling/Ranking/Classifiers/EN_AU.hs
+++ b/Duckling/Ranking/Classifiers/EN_AU.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_BZ.hs b/Duckling/Ranking/Classifiers/EN_BZ.hs
index 79d28834..1799d0df 100644
--- a/Duckling/Ranking/Classifiers/EN_BZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_BZ.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_CA.hs b/Duckling/Ranking/Classifiers/EN_CA.hs
index e297e089..53598eb1 100644
--- a/Duckling/Ranking/Classifiers/EN_CA.hs
+++ b/Duckling/Ranking/Classifiers/EN_CA.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5867177177132139, unseen = -5.749392985908253,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 312},
+                     ClassData{prior = -0.5810835175595287, unseen = -5.762051382780177,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 316},
                    koData =
-                     ClassData{prior = -0.8122680090579887,
+                     ClassData{prior = -0.8193728346817333,
                                unseen = -5.5254529391317835,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 249}}),
        ("<year> (bc|ad)",
@@ -803,226 +803,228 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4595323293784402, unseen = -6.767343125265392,
+                     ClassData{prior = -0.45502926612428546,
+                               unseen = -6.776506992372183,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.073044534100405),
-                                    ("Father's Dayyear (latent)", -6.073044534100405),
-                                    ("Ramadanyear (latent)", -6.073044534100405),
+                                   [("Navaratriyear (latent)", -6.082218910376446),
+                                    ("Father's Dayyear (latent)", -6.082218910376446),
+                                    ("Ramadanyear (latent)", -6.082218910376446),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.820281565605037),
-                                    ("Bhai Doojyear (latent)", -6.073044534100405),
+                                     -4.829455941881078),
+                                    ("Bhai Doojyear (latent)", -6.082218910376446),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.820281565605037),
-                                    ("hourday", -4.36829644186198), ("dayhour", -3.26968415319387),
-                                    ("Martin Luther King's Dayyear (latent)", -5.6675794259922405),
-                                    ("Shemini Atzeretyear (latent)", -6.073044534100405),
-                                    ("daymonth", -5.37989735354046),
-                                    ("monthday", -5.6675794259922405),
-                                    ("monthyear", -4.28128506487235),
-                                    ("Yom Ha'atzmautyear (latent)", -6.073044534100405),
-                                    ("Vijayadashamiyear (latent)", -6.073044534100405),
+                                     -4.829455941881078),
+                                    ("hourday", -4.377470818138021),
+                                    ("dayhour", -3.278858529469911),
+                                    ("Martin Luther King's Dayyear (latent)", -5.676753802268282),
+                                    ("Shemini Atzeretyear (latent)", -6.082218910376446),
+                                    ("daymonth", -5.389071729816501),
+                                    ("monthday", -5.676753802268282),
+                                    ("monthyear", -4.290459441148391),
+                                    ("Yom Ha'atzmautyear (latent)", -6.082218910376446),
+                                    ("Vijayadashamiyear (latent)", -6.082218910376446),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -5.6675794259922405),
-                                    ("Thanksgiving Dayyear (latent)", -4.974432245432295),
-                                    ("Thai Pongalyear (latent)", -5.37989735354046),
-                                    ("Thiru Onamyear (latent)", -5.37989735354046),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.073044534100405),
+                                     -5.676753802268282),
+                                    ("Thanksgiving Dayyear (latent)", -4.983606621708336),
+                                    ("Thai Pongalyear (latent)", -5.389071729816501),
+                                    ("Thiru Onamyear (latent)", -5.389071729816501),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.082218910376446),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.073044534100405),
-                                    ("houryear", -5.37989735354046),
+                                     -6.082218910376446),
+                                    ("houryear", -5.389071729816501),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.073044534100405),
-                                    ("Christmas<time-of-day> am|pm", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("Christmas<time-of-day> am|pm", -6.082218910376446),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.073044534100405),
+                                     -6.082218910376446),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.37989735354046),
-                                    ("<time-of-day> am|pmintersect", -4.820281565605037),
-                                    ("Earth Houryear (latent)", -6.073044534100405),
-                                    ("Family Dayyear (latent)", -5.15675380222625),
-                                    ("Octoberyear (latent)", -4.5689671373241305),
-                                    ("intersect<time-of-day> am|pm", -6.073044534100405),
-                                    ("Mattu Pongalyear (latent)", -6.073044534100405),
-                                    ("Shavuotyear (latent)", -6.073044534100405),
-                                    ("Dhanterasin <named-month>|year", -6.073044534100405),
+                                     -5.389071729816501),
+                                    ("<time-of-day> am|pmintersect", -4.829455941881078),
+                                    ("Earth Houryear (latent)", -6.082218910376446),
+                                    ("Family Dayyear (latent)", -5.165928178502291),
+                                    ("Octoberyear (latent)", -4.578141513600172),
+                                    ("intersect<time-of-day> am|pm", -6.082218910376446),
+                                    ("Mattu Pongalyear (latent)", -6.082218910376446),
+                                    ("Shavuotyear (latent)", -6.082218910376446),
+                                    ("Dhanterasin <named-month>|year", -6.082218910376446),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.073044534100405),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.082218910376446),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.6675794259922405),
-                                    ("Marchyear (latent)", -6.073044534100405),
-                                    ("Sukkotyear (latent)", -5.6675794259922405),
+                                     -5.676753802268282),
+                                    ("Marchyear (latent)", -6.082218910376446),
+                                    ("Sukkotyear (latent)", -5.676753802268282),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.073044534100405),
-                                    ("Clean Mondayyear (latent)", -5.6675794259922405),
-                                    ("monthhour", -5.6675794259922405),
-                                    ("todayat <time-of-day>", -6.073044534100405),
-                                    ("Thursday<time> timezone", -4.36829644186198),
+                                     -6.082218910376446),
+                                    ("Clean Mondayyear (latent)", -5.676753802268282),
+                                    ("monthhour", -5.676753802268282),
+                                    ("todayat <time-of-day>", -6.082218910376446),
+                                    ("Thursday<time> timezone", -4.377470818138021),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.073044534100405),
-                                    ("Palm SundaySunday", -5.6675794259922405),
-                                    ("dayday", -3.8758199567641856),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.073044534100405),
-                                    ("mm/ddat <time-of-day>", -6.073044534100405),
-                                    ("tonightat <time-of-day>", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("Palm SundaySunday", -5.676753802268282),
+                                    ("dayday", -3.884994333040227),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.082218910376446),
+                                    ("mm/ddat <time-of-day>", -6.082218910376446),
+                                    ("tonightat <time-of-day>", -6.082218910376446),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.37989735354046),
-                                    ("today<time-of-day> am|pm", -6.073044534100405),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.6675794259922405),
-                                    ("at <time-of-day><time> <part-of-day>", -6.073044534100405),
-                                    ("mm/dd<time-of-day> am|pm", -6.073044534100405),
-                                    ("hourhour", -4.820281565605037),
-                                    ("<time-of-day> am|pmon <date>", -4.05814151355814),
-                                    ("National Patriots' Dayyear (latent)", -5.37989735354046),
-                                    ("Wednesdaythis|last|next <cycle>", -6.073044534100405),
-                                    ("Lentyear (latent)", -6.073044534100405),
+                                     -5.389071729816501),
+                                    ("today<time-of-day> am|pm", -6.082218910376446),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.676753802268282),
+                                    ("at <time-of-day><time> <part-of-day>", -6.082218910376446),
+                                    ("mm/dd<time-of-day> am|pm", -6.082218910376446),
+                                    ("hourhour", -4.829455941881078),
+                                    ("<time-of-day> am|pmon <date>", -4.067315889834181),
+                                    ("National Patriots' Dayyear (latent)", -5.389071729816501),
+                                    ("Wednesdaythis|last|next <cycle>", -6.082218910376446),
+                                    ("Lentyear (latent)", -6.082218910376446),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.5689671373241305),
-                                    ("Boghiyear (latent)", -6.073044534100405),
-                                    ("dayyear", -1.929909807708872),
-                                    ("Thursdayfrom|since|after <time>", -5.6675794259922405),
+                                     -4.578141513600172),
+                                    ("Boghiyear (latent)", -6.082218910376446),
+                                    ("dayyear", -1.907831640480809),
+                                    ("Thursdayfrom|since|after <time>", -5.676753802268282),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.073044534100405),
-                                    ("Thursdayat <time-of-day>", -5.6675794259922405),
-                                    ("Islamic New Yearyear (latent)", -5.6675794259922405),
-                                    ("Laylat al-Qadryear (latent)", -5.15675380222625),
-                                    ("Chhathin <named-month>|year", -6.073044534100405),
-                                    ("Vasant Panchamiin <named-month>|year", -6.073044534100405),
-                                    ("Diwaliin <named-month>|year", -6.073044534100405),
-                                    ("Discovery Dayyear (latent)", -5.6675794259922405),
-                                    ("Shrove Tuesdayyear (latent)", -6.073044534100405),
-                                    ("<time-of-day> am|pmtomorrow", -5.37989735354046),
-                                    ("Yom Kippuryear (latent)", -6.073044534100405),
-                                    ("<part-of-day> of <time>year (latent)", -6.073044534100405),
-                                    ("minutehour", -5.15675380222625),
-                                    ("Kaanum Pongalyear (latent)", -5.6675794259922405),
-                                    ("Maha Saptamiyear (latent)", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("Thursdayat <time-of-day>", -5.676753802268282),
+                                    ("Islamic New Yearyear (latent)", -5.676753802268282),
+                                    ("Laylat al-Qadryear (latent)", -5.165928178502291),
+                                    ("Chhathin <named-month>|year", -6.082218910376446),
+                                    ("Vasant Panchamiin <named-month>|year", -6.082218910376446),
+                                    ("Diwaliin <named-month>|year", -6.082218910376446),
+                                    ("Discovery Dayyear (latent)", -5.676753802268282),
+                                    ("Shrove Tuesdayyear (latent)", -6.082218910376446),
+                                    ("<time-of-day> am|pmtomorrow", -5.389071729816501),
+                                    ("Yom Kippuryear (latent)", -6.082218910376446),
+                                    ("<part-of-day> of <time>year (latent)", -6.082218910376446),
+                                    ("minutehour", -5.165928178502291),
+                                    ("Kaanum Pongalyear (latent)", -5.676753802268282),
+                                    ("Maha Saptamiyear (latent)", -6.082218910376446),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.6675794259922405),
+                                     -5.676753802268282),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.36829644186198),
-                                    ("for <duration> from <time>December", -6.073044534100405),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.073044534100405),
+                                     -4.377470818138021),
+                                    ("for <duration> from <time>December", -6.082218910376446),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.082218910376446),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.15675380222625),
+                                     -5.165928178502291),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.6675794259922405),
-                                    ("Pentecostyear (latent)", -6.073044534100405),
+                                     -5.676753802268282),
+                                    ("Pentecostyear (latent)", -6.082218910376446),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.15675380222625),
-                                    ("Eid al-Fitryear (latent)", -6.073044534100405),
-                                    ("Mondayin|during the <part-of-day>", -6.073044534100405),
-                                    ("Raksha Bandhanyear (latent)", -6.073044534100405),
+                                     -5.165928178502291),
+                                    ("Eid al-Fitryear (latent)", -6.082218910376446),
+                                    ("Mondayin|during the <part-of-day>", -6.082218910376446),
+                                    ("Raksha Bandhanyear (latent)", -6.082218910376446),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.6675794259922405),
-                                    ("Navaratriin <named-month>|year", -6.073044534100405),
-                                    ("Ashurayear (latent)", -6.073044534100405),
-                                    ("Chinese New Yearyear (latent)", -6.073044534100405),
-                                    ("Sundayyear (latent)", -6.073044534100405),
-                                    ("Lag BaOmeryear (latent)", -6.073044534100405),
+                                     -5.676753802268282),
+                                    ("Navaratriin <named-month>|year", -6.082218910376446),
+                                    ("Ashurayear (latent)", -6.082218910376446),
+                                    ("Chinese New Yearyear (latent)", -6.082218910376446),
+                                    ("Sundayyear (latent)", -6.082218910376446),
+                                    ("Lag BaOmeryear (latent)", -6.082218910376446),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.073044534100405),
-                                    ("Eid al-Adhayear (latent)", -5.15675380222625),
-                                    ("intersectin|during the <part-of-day>", -6.073044534100405),
-                                    ("Christmasat <time-of-day>", -6.073044534100405),
-                                    ("Passoveryear (latent)", -6.073044534100405),
-                                    ("Lazarus Saturdayyear (latent)", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("Eid al-Adhayear (latent)", -5.165928178502291),
+                                    ("intersectin|during the <part-of-day>", -6.082218910376446),
+                                    ("Christmasat <time-of-day>", -6.082218910376446),
+                                    ("Passoveryear (latent)", -6.082218910376446),
+                                    ("Lazarus Saturdayyear (latent)", -6.082218910376446),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.073044534100405),
-                                    ("Yom HaShoahyear (latent)", -5.6675794259922405),
+                                     -6.082218910376446),
+                                    ("Yom HaShoahyear (latent)", -5.676753802268282),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.6675794259922405),
+                                     -5.676753802268282),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.073044534100405),
-                                    ("Thai Pongalin <named-month>|year", -6.073044534100405),
-                                    ("Septemberyear (latent)", -5.6675794259922405),
-                                    ("mm/ddyear (latent)", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("Thai Pongalin <named-month>|year", -6.082218910376446),
+                                    ("Septemberyear (latent)", -5.676753802268282),
+                                    ("mm/ddyear (latent)", -6.082218910376446),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.820281565605037),
-                                    ("Halloweenyear (latent)", -6.073044534100405),
+                                     -4.829455941881078),
+                                    ("Halloweenyear (latent)", -6.082218910376446),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.6675794259922405),
+                                     -5.676753802268282),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.37989735354046),
+                                     -5.389071729816501),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.15675380222625),
-                                    ("at <time-of-day>intersect", -5.6675794259922405),
-                                    ("Rosh Hashanahyear (latent)", -6.073044534100405),
-                                    ("Dhanterasyear (latent)", -6.073044534100405),
-                                    ("Tu BiShvatyear (latent)", -6.073044534100405),
-                                    ("Holiyear (latent)", -5.37989735354046),
+                                     -5.165928178502291),
+                                    ("at <time-of-day>intersect", -5.676753802268282),
+                                    ("Rosh Hashanahyear (latent)", -5.389071729816501),
+                                    ("Dhanterasyear (latent)", -6.082218910376446),
+                                    ("Tu BiShvatyear (latent)", -6.082218910376446),
+                                    ("Holiyear (latent)", -5.389071729816501),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.073044534100405),
-                                    ("Holika Dahanyear (latent)", -5.37989735354046),
+                                     -6.082218910376446),
+                                    ("Holika Dahanyear (latent)", -5.389071729816501),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.073044534100405),
-                                    ("dayminute", -3.4339872044851463),
-                                    ("Mawlidyear (latent)", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("dayminute", -3.4431615807611875),
+                                    ("Mawlidyear (latent)", -6.082218910376446),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.6675794259922405),
+                                     -5.676753802268282),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.073044534100405),
-                                    ("Jumu'atul-Widayear (latent)", -5.15675380222625),
+                                     -6.082218910376446),
+                                    ("Jumu'atul-Widayear (latent)", -5.165928178502291),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.073044534100405),
-                                    ("minuteday", -2.435458374374019),
+                                     -6.082218910376446),
+                                    ("minuteday", -2.4446327506500602),
                                     ("absorption of , after named dayintersect",
-                                     -6.073044534100405),
-                                    ("intersectyear (latent)", -6.073044534100405),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("intersectyear (latent)", -6.082218910376446),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.082218910376446),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.073044534100405),
+                                     -6.082218910376446),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.073044534100405),
-                                    ("Boss's Dayyear (latent)", -5.6675794259922405),
-                                    ("Global Youth Service Dayyear (latent)", -6.073044534100405),
-                                    ("Tisha B'Avyear (latent)", -6.073044534100405),
-                                    ("Isra and Mi'rajyear (latent)", -5.15675380222625),
+                                     -6.082218910376446),
+                                    ("Boss's Dayyear (latent)", -5.676753802268282),
+                                    ("Global Youth Service Dayyear (latent)", -6.082218910376446),
+                                    ("Tisha B'Avyear (latent)", -6.082218910376446),
+                                    ("Isra and Mi'rajyear (latent)", -5.165928178502291),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.073044534100405),
-                                    ("Christmasyear (latent)", -5.6675794259922405),
-                                    ("Naraka Chaturdashiyear (latent)", -5.6675794259922405),
-                                    ("at <time-of-day>on <date>", -4.974432245432295),
+                                     -6.082218910376446),
+                                    ("Christmasyear (latent)", -5.676753802268282),
+                                    ("Naraka Chaturdashiyear (latent)", -5.676753802268282),
+                                    ("at <time-of-day>on <date>", -4.983606621708336),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.463606621666305),
-                                    ("dayweek", -6.073044534100405),
-                                    ("Easter Sundayyear (latent)", -5.37989735354046),
-                                    ("Labour Dayyear (latent)", -6.073044534100405),
-                                    ("weekyear", -4.974432245432295),
-                                    ("hh:mmin|during the <part-of-day>", -5.37989735354046),
+                                     -4.472780997942346),
+                                    ("dayweek", -6.082218910376446),
+                                    ("Easter Sundayyear (latent)", -5.389071729816501),
+                                    ("Labour Dayyear (latent)", -6.082218910376446),
+                                    ("weekyear", -4.983606621708336),
+                                    ("hh:mmin|during the <part-of-day>", -5.389071729816501),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.6675794259922405),
-                                    ("Hanukkahyear (latent)", -6.073044534100405),
-                                    ("February<time> <part-of-day>", -6.073044534100405),
-                                    ("Tuesdayin <named-month>|year", -6.073044534100405),
-                                    ("Great Lentyear (latent)", -6.073044534100405),
-                                    ("tomorrowat <time-of-day>", -5.37989735354046),
-                                    ("between <time> and <time>on <date>", -4.463606621666305),
-                                    ("last <cycle> of <time>year (latent)", -5.37989735354046),
-                                    ("at <time-of-day>tomorrow", -5.6675794259922405),
-                                    ("tomorrow<time-of-day> am|pm", -6.073044534100405),
+                                     -5.676753802268282),
+                                    ("Hanukkahyear (latent)", -5.389071729816501),
+                                    ("February<time> <part-of-day>", -6.082218910376446),
+                                    ("Tuesdayin <named-month>|year", -6.082218910376446),
+                                    ("Great Lentyear (latent)", -6.082218910376446),
+                                    ("tomorrowat <time-of-day>", -5.389071729816501),
+                                    ("between <time> and <time>on <date>", -4.472780997942346),
+                                    ("last <cycle> of <time>year (latent)", -5.389071729816501),
+                                    ("at <time-of-day>tomorrow", -5.676753802268282),
+                                    ("tomorrow<time-of-day> am|pm", -6.082218910376446),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.073044534100405),
-                                    ("Diwaliyear (latent)", -6.073044534100405),
-                                    ("Black Fridayyear (latent)", -5.6675794259922405),
+                                     -6.082218910376446),
+                                    ("Diwaliyear (latent)", -6.082218910376446),
+                                    ("Black Fridayyear (latent)", -5.676753802268282),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.073044534100405),
+                                     -6.082218910376446),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.073044534100405),
-                                    ("Chhathyear (latent)", -5.6675794259922405),
-                                    ("Vasant Panchamiyear (latent)", -6.073044534100405),
-                                    ("Palm Sundayintersect", -6.073044534100405),
+                                     -6.082218910376446),
+                                    ("Chhathyear (latent)", -5.676753802268282),
+                                    ("Vasant Panchamiyear (latent)", -6.082218910376446),
+                                    ("Palm Sundayintersect", -6.082218910376446),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.073044534100405),
-                                    ("Februaryintersect", -6.073044534100405),
-                                    ("Mother's Dayyear (latent)", -6.073044534100405),
-                                    ("Simchat Torahyear (latent)", -6.073044534100405),
-                                    ("Victoria Dayyear (latent)", -5.6675794259922405),
-                                    ("minuteyear", -6.073044534100405)],
-                               n = 324},
+                                     -6.082218910376446),
+                                    ("Februaryintersect", -6.082218910376446),
+                                    ("Mother's Dayyear (latent)", -6.082218910376446),
+                                    ("Simchat Torahyear (latent)", -6.082218910376446),
+                                    ("Victoria Dayyear (latent)", -5.676753802268282),
+                                    ("minuteyear", -6.082218910376446)],
+                               n = 328},
                    koData =
-                     ClassData{prior = -0.9985288301111273, unseen = -6.395261598115449,
+                     ClassData{prior = -1.0062958594487867, unseen = -6.395261598115449,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1359,14 +1361,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.1466034741918754, unseen = -5.056245805348308,
+                     ClassData{prior = -0.1431008436406733, unseen = -5.081404364984463,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -3.922071315328127e-2),
-                                    ("intersect 2 numbers", -3.6635616461296463)],
-                               n = 152},
+                                   [("integer (numeric)", -3.822121282019774e-2),
+                                    ("intersect 2 numbers", -3.6888794541139363)],
+                               n = 156},
                    koData =
-                     ClassData{prior = -1.9924301646902063, unseen = -3.367295829986474,
+                     ClassData{prior = -2.0149030205422647, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.1349799328389845),
@@ -1430,8 +1432,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2152,8 +2154,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_GB.hs b/Duckling/Ranking/Classifiers/EN_GB.hs
index fdefa9ad..15e62c9c 100644
--- a/Duckling/Ranking/Classifiers/EN_GB.hs
+++ b/Duckling/Ranking/Classifiers/EN_GB.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.6103412768757128, unseen = -5.717027701406222,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 302},
+                     ClassData{prior = -0.6043516817768142, unseen = -5.730099782973574,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 306},
                    koData =
-                     ClassData{prior = -0.7834340272320458, unseen = -5.545177444479562,
+                     ClassData{prior = -0.7906025167106583, unseen = -5.545177444479562,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 254}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -789,221 +789,218 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4771436833792122, unseen = -6.739336627357174,
+                     ClassData{prior = -0.4723593429381946, unseen = -6.748759547491679,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.045005314036012),
-                                    ("Father's Dayyear (latent)", -6.045005314036012),
-                                    ("Ramadanyear (latent)", -6.045005314036012),
+                                   [("Navaratriyear (latent)", -6.05443934626937),
+                                    ("Father's Dayyear (latent)", -6.05443934626937),
+                                    ("Ramadanyear (latent)", -6.05443934626937),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.792242345540644),
-                                    ("Bhai Doojyear (latent)", -6.045005314036012),
+                                     -4.801676377774002),
+                                    ("Bhai Doojyear (latent)", -6.05443934626937),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.792242345540644),
-                                    ("hourday", -4.340257221797587),
-                                    ("dayhour", -3.2416449331294768),
-                                    ("Martin Luther King's Dayyear (latent)", -5.639540205927847),
-                                    ("Shemini Atzeretyear (latent)", -6.045005314036012),
-                                    ("daymonth", -5.351858133476067),
-                                    ("monthday", -5.639540205927847),
-                                    ("monthyear", -4.253245844807957),
-                                    ("Yom Ha'atzmautyear (latent)", -6.045005314036012),
-                                    ("Vijayadashamiyear (latent)", -6.045005314036012),
-                                    ("Thanksgiving Dayyear (latent)", -4.946393025367902),
-                                    ("Thai Pongalyear (latent)", -5.351858133476067),
-                                    ("Thiru Onamyear (latent)", -5.351858133476067),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.045005314036012),
+                                     -4.801676377774002),
+                                    ("hourday", -4.349691254030945),
+                                    ("dayhour", -3.2510789653628356),
+                                    ("Martin Luther King's Dayyear (latent)", -5.648974238161206),
+                                    ("Shemini Atzeretyear (latent)", -6.05443934626937),
+                                    ("daymonth", -5.3612921657094255),
+                                    ("monthday", -5.648974238161206),
+                                    ("monthyear", -4.2626798770413155),
+                                    ("Yom Ha'atzmautyear (latent)", -6.05443934626937),
+                                    ("Vijayadashamiyear (latent)", -6.05443934626937),
+                                    ("Thanksgiving Dayyear (latent)", -4.955827057601261),
+                                    ("Thai Pongalyear (latent)", -5.3612921657094255),
+                                    ("Thiru Onamyear (latent)", -5.3612921657094255),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.05443934626937),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.045005314036012),
-                                    ("houryear", -5.351858133476067),
+                                     -6.05443934626937),
+                                    ("houryear", -5.3612921657094255),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.045005314036012),
-                                    ("Christmas<time-of-day> am|pm", -6.045005314036012),
+                                     -6.05443934626937),
+                                    ("Christmas<time-of-day> am|pm", -6.05443934626937),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.045005314036012),
+                                     -6.05443934626937),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.351858133476067),
-                                    ("<time-of-day> am|pmintersect", -4.792242345540644),
-                                    ("Earth Houryear (latent)", -6.045005314036012),
-                                    ("Octoberyear (latent)", -4.540927917259737),
-                                    ("intersect<time-of-day> am|pm", -6.045005314036012),
-                                    ("Mattu Pongalyear (latent)", -6.045005314036012),
-                                    ("Shavuotyear (latent)", -6.045005314036012),
-                                    ("Dhanterasin <named-month>|year", -6.045005314036012),
+                                     -5.3612921657094255),
+                                    ("<time-of-day> am|pmintersect", -4.801676377774002),
+                                    ("Earth Houryear (latent)", -6.05443934626937),
+                                    ("Octoberyear (latent)", -4.550361949493096),
+                                    ("intersect<time-of-day> am|pm", -6.05443934626937),
+                                    ("Mattu Pongalyear (latent)", -6.05443934626937),
+                                    ("Shavuotyear (latent)", -6.05443934626937),
+                                    ("Dhanterasin <named-month>|year", -6.05443934626937),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.045005314036012),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.045005314036012),
+                                     -6.05443934626937),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.05443934626937),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.639540205927847),
-                                    ("Marchyear (latent)", -6.045005314036012),
-                                    ("Sukkotyear (latent)", -5.639540205927847),
+                                     -5.648974238161206),
+                                    ("Marchyear (latent)", -6.05443934626937),
+                                    ("Sukkotyear (latent)", -5.648974238161206),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.045005314036012),
-                                    ("Clean Mondayyear (latent)", -5.639540205927847),
-                                    ("monthhour", -5.639540205927847),
-                                    ("todayat <time-of-day>", -6.045005314036012),
-                                    ("Thursday<time> timezone", -4.340257221797587),
-                                    ("dd/mm<time-of-day> am|pm", -6.045005314036012),
-                                    ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.045005314036012),
-                                    ("Palm SundaySunday", -5.639540205927847),
-                                    ("dayday", -3.8477807366997925),
-                                    ("dd/mmat <time-of-day>", -6.045005314036012),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.045005314036012),
-                                    ("tonightat <time-of-day>", -6.045005314036012),
+                                     -6.05443934626937),
+                                    ("Clean Mondayyear (latent)", -5.648974238161206),
+                                    ("monthhour", -5.648974238161206),
+                                    ("todayat <time-of-day>", -6.05443934626937),
+                                    ("Thursday<time> timezone", -4.349691254030945),
+                                    ("dd/mm<time-of-day> am|pm", -6.05443934626937),
+                                    ("this <time>hh(:mm) - <time-of-day> am|pm", -6.05443934626937),
+                                    ("Palm SundaySunday", -5.648974238161206),
+                                    ("dayday", -3.857214768933151),
+                                    ("dd/mmat <time-of-day>", -6.05443934626937),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.05443934626937),
+                                    ("tonightat <time-of-day>", -6.05443934626937),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.351858133476067),
-                                    ("today<time-of-day> am|pm", -6.045005314036012),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.639540205927847),
-                                    ("at <time-of-day><time> <part-of-day>", -6.045005314036012),
-                                    ("hourhour", -4.792242345540644),
-                                    ("<time-of-day> am|pmon <date>", -4.030102293493747),
-                                    ("Wednesdaythis|last|next <cycle>", -6.045005314036012),
-                                    ("Lentyear (latent)", -6.045005314036012),
+                                     -5.3612921657094255),
+                                    ("today<time-of-day> am|pm", -6.05443934626937),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.648974238161206),
+                                    ("at <time-of-day><time> <part-of-day>", -6.05443934626937),
+                                    ("hourhour", -4.801676377774002),
+                                    ("<time-of-day> am|pmon <date>", -4.039536325727106),
+                                    ("Wednesdaythis|last|next <cycle>", -6.05443934626937),
+                                    ("Lentyear (latent)", -6.05443934626937),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.540927917259737),
-                                    ("Boghiyear (latent)", -6.045005314036012),
-                                    ("dayyear", -1.9845623034895925),
-                                    ("Thursdayfrom|since|after <time>", -5.639540205927847),
+                                     -4.550361949493096),
+                                    ("Boghiyear (latent)", -6.05443934626937),
+                                    ("dayyear", -1.9600947840472698),
+                                    ("Thursdayfrom|since|after <time>", -5.648974238161206),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.045005314036012),
-                                    ("Thursdayat <time-of-day>", -5.639540205927847),
-                                    ("Islamic New Yearyear (latent)", -5.639540205927847),
-                                    ("Laylat al-Qadryear (latent)", -5.128714582161857),
-                                    ("Chhathin <named-month>|year", -6.045005314036012),
-                                    ("Vasant Panchamiin <named-month>|year", -6.045005314036012),
-                                    ("Diwaliin <named-month>|year", -6.045005314036012),
-                                    ("Shrove Tuesdayyear (latent)", -6.045005314036012),
-                                    ("<time-of-day> am|pmtomorrow", -5.351858133476067),
-                                    ("Yom Kippuryear (latent)", -6.045005314036012),
-                                    ("<part-of-day> of <time>year (latent)", -6.045005314036012),
-                                    ("minutehour", -5.128714582161857),
-                                    ("Kaanum Pongalyear (latent)", -5.639540205927847),
-                                    ("Maha Saptamiyear (latent)", -6.045005314036012),
+                                     -6.05443934626937),
+                                    ("Thursdayat <time-of-day>", -5.648974238161206),
+                                    ("Islamic New Yearyear (latent)", -5.648974238161206),
+                                    ("Laylat al-Qadryear (latent)", -5.138148614395216),
+                                    ("Chhathin <named-month>|year", -6.05443934626937),
+                                    ("Vasant Panchamiin <named-month>|year", -6.05443934626937),
+                                    ("Diwaliin <named-month>|year", -6.05443934626937),
+                                    ("Shrove Tuesdayyear (latent)", -6.05443934626937),
+                                    ("<time-of-day> am|pmtomorrow", -5.3612921657094255),
+                                    ("Yom Kippuryear (latent)", -6.05443934626937),
+                                    ("<part-of-day> of <time>year (latent)", -6.05443934626937),
+                                    ("minutehour", -5.138148614395216),
+                                    ("Kaanum Pongalyear (latent)", -5.648974238161206),
+                                    ("Maha Saptamiyear (latent)", -6.05443934626937),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.639540205927847),
+                                     -5.648974238161206),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.340257221797587),
-                                    ("for <duration> from <time>December", -6.045005314036012),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.045005314036012),
+                                     -4.349691254030945),
+                                    ("for <duration> from <time>December", -6.05443934626937),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.05443934626937),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.128714582161857),
+                                     -5.138148614395216),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.639540205927847),
-                                    ("Pentecostyear (latent)", -6.045005314036012),
+                                     -5.648974238161206),
+                                    ("Pentecostyear (latent)", -6.05443934626937),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.128714582161857),
-                                    ("Eid al-Fitryear (latent)", -6.045005314036012),
-                                    ("Mondayin|during the <part-of-day>", -6.045005314036012),
-                                    ("Raksha Bandhanyear (latent)", -6.045005314036012),
+                                     -5.138148614395216),
+                                    ("Eid al-Fitryear (latent)", -6.05443934626937),
+                                    ("Mondayin|during the <part-of-day>", -6.05443934626937),
+                                    ("Raksha Bandhanyear (latent)", -6.05443934626937),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.639540205927847),
-                                    ("Navaratriin <named-month>|year", -6.045005314036012),
-                                    ("Ashurayear (latent)", -6.045005314036012),
-                                    ("Chinese New Yearyear (latent)", -6.045005314036012),
-                                    ("Sundayyear (latent)", -6.045005314036012),
-                                    ("Lag BaOmeryear (latent)", -6.045005314036012),
+                                     -5.648974238161206),
+                                    ("Navaratriin <named-month>|year", -6.05443934626937),
+                                    ("Ashurayear (latent)", -6.05443934626937),
+                                    ("Chinese New Yearyear (latent)", -6.05443934626937),
+                                    ("Sundayyear (latent)", -6.05443934626937),
+                                    ("Lag BaOmeryear (latent)", -6.05443934626937),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.045005314036012),
-                                    ("Eid al-Adhayear (latent)", -5.128714582161857),
-                                    ("intersectin|during the <part-of-day>", -6.045005314036012),
-                                    ("Christmasat <time-of-day>", -6.045005314036012),
-                                    ("Passoveryear (latent)", -6.045005314036012),
-                                    ("Lazarus Saturdayyear (latent)", -6.045005314036012),
-                                    ("dd/mmyear (latent)", -6.045005314036012),
+                                     -6.05443934626937),
+                                    ("Eid al-Adhayear (latent)", -5.138148614395216),
+                                    ("intersectin|during the <part-of-day>", -6.05443934626937),
+                                    ("Christmasat <time-of-day>", -6.05443934626937),
+                                    ("Passoveryear (latent)", -6.05443934626937),
+                                    ("Lazarus Saturdayyear (latent)", -6.05443934626937),
+                                    ("dd/mmyear (latent)", -6.05443934626937),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.045005314036012),
-                                    ("Yom HaShoahyear (latent)", -5.639540205927847),
+                                     -6.05443934626937),
+                                    ("Yom HaShoahyear (latent)", -5.648974238161206),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.639540205927847),
+                                     -5.648974238161206),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.045005314036012),
-                                    ("Thai Pongalin <named-month>|year", -6.045005314036012),
-                                    ("Septemberyear (latent)", -5.639540205927847),
+                                     -6.05443934626937),
+                                    ("Thai Pongalin <named-month>|year", -6.05443934626937),
+                                    ("Septemberyear (latent)", -5.648974238161206),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.792242345540644),
-                                    ("Halloweenyear (latent)", -6.045005314036012),
+                                     -4.801676377774002),
+                                    ("Halloweenyear (latent)", -6.05443934626937),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.639540205927847),
+                                     -5.648974238161206),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.351858133476067),
+                                     -5.3612921657094255),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.128714582161857),
-                                    ("at <time-of-day>intersect", -5.639540205927847),
-                                    ("Rosh Hashanahyear (latent)", -6.045005314036012),
-                                    ("Dhanterasyear (latent)", -6.045005314036012),
-                                    ("Tu BiShvatyear (latent)", -6.045005314036012),
-                                    ("Holiyear (latent)", -5.351858133476067),
+                                     -5.138148614395216),
+                                    ("at <time-of-day>intersect", -5.648974238161206),
+                                    ("Rosh Hashanahyear (latent)", -5.3612921657094255),
+                                    ("Dhanterasyear (latent)", -6.05443934626937),
+                                    ("Tu BiShvatyear (latent)", -6.05443934626937),
+                                    ("Holiyear (latent)", -5.3612921657094255),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.045005314036012),
-                                    ("Holika Dahanyear (latent)", -5.351858133476067),
+                                     -6.05443934626937),
+                                    ("Holika Dahanyear (latent)", -5.3612921657094255),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.045005314036012),
-                                    ("dayminute", -3.405947984420753),
-                                    ("Mawlidyear (latent)", -6.045005314036012),
+                                     -6.05443934626937),
+                                    ("dayminute", -3.4153820166541116),
+                                    ("Mawlidyear (latent)", -6.05443934626937),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.639540205927847),
+                                     -5.648974238161206),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.045005314036012),
-                                    ("Jumu'atul-Widayear (latent)", -5.128714582161857),
+                                     -6.05443934626937),
+                                    ("Jumu'atul-Widayear (latent)", -5.138148614395216),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.045005314036012),
-                                    ("minuteday", -2.407419154309626),
-                                    ("absorption of , after named dayintersect",
-                                     -6.045005314036012),
-                                    ("intersectyear (latent)", -6.045005314036012),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.045005314036012),
-                                    ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.045005314036012),
+                                     -6.05443934626937),
+                                    ("minuteday", -2.4168531865429848),
+                                    ("absorption of , after named dayintersect", -6.05443934626937),
+                                    ("intersectyear (latent)", -6.05443934626937),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.05443934626937),
+                                    ("<ordinal> <cycle> of <time>year (latent)", -6.05443934626937),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.045005314036012),
-                                    ("Mothering Sundayyear (latent)", -5.639540205927847),
-                                    ("Boss's Dayyear (latent)", -5.639540205927847),
-                                    ("Global Youth Service Dayyear (latent)", -6.045005314036012),
-                                    ("Tisha B'Avyear (latent)", -6.045005314036012),
-                                    ("Isra and Mi'rajyear (latent)", -5.128714582161857),
+                                     -6.05443934626937),
+                                    ("Mothering Sundayyear (latent)", -5.648974238161206),
+                                    ("Boss's Dayyear (latent)", -5.648974238161206),
+                                    ("Global Youth Service Dayyear (latent)", -6.05443934626937),
+                                    ("Tisha B'Avyear (latent)", -6.05443934626937),
+                                    ("Isra and Mi'rajyear (latent)", -5.138148614395216),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.045005314036012),
-                                    ("Christmasyear (latent)", -5.639540205927847),
-                                    ("Naraka Chaturdashiyear (latent)", -5.639540205927847),
-                                    ("at <time-of-day>on <date>", -4.946393025367902),
+                                     -6.05443934626937),
+                                    ("Christmasyear (latent)", -5.648974238161206),
+                                    ("Naraka Chaturdashiyear (latent)", -5.648974238161206),
+                                    ("at <time-of-day>on <date>", -4.955827057601261),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.4355674016019115),
-                                    ("dayweek", -6.045005314036012),
-                                    ("Easter Sundayyear (latent)", -5.351858133476067),
-                                    ("weekyear", -4.946393025367902),
-                                    ("hh:mmin|during the <part-of-day>", -5.351858133476067),
+                                     -4.44500143383527),
+                                    ("dayweek", -6.05443934626937),
+                                    ("Easter Sundayyear (latent)", -5.3612921657094255),
+                                    ("weekyear", -4.955827057601261),
+                                    ("hh:mmin|during the <part-of-day>", -5.3612921657094255),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.639540205927847),
-                                    ("Hanukkahyear (latent)", -6.045005314036012),
-                                    ("February<time> <part-of-day>", -6.045005314036012),
-                                    ("Tuesdayin <named-month>|year", -6.045005314036012),
-                                    ("Great Lentyear (latent)", -6.045005314036012),
-                                    ("tomorrowat <time-of-day>", -5.351858133476067),
-                                    ("between <time> and <time>on <date>", -4.4355674016019115),
-                                    ("last <cycle> of <time>year (latent)", -5.351858133476067),
-                                    ("at <time-of-day>tomorrow", -5.639540205927847),
-                                    ("tomorrow<time-of-day> am|pm", -6.045005314036012),
+                                     -5.648974238161206),
+                                    ("Hanukkahyear (latent)", -5.3612921657094255),
+                                    ("February<time> <part-of-day>", -6.05443934626937),
+                                    ("Tuesdayin <named-month>|year", -6.05443934626937),
+                                    ("Great Lentyear (latent)", -6.05443934626937),
+                                    ("tomorrowat <time-of-day>", -5.3612921657094255),
+                                    ("between <time> and <time>on <date>", -4.44500143383527),
+                                    ("last <cycle> of <time>year (latent)", -5.3612921657094255),
+                                    ("at <time-of-day>tomorrow", -5.648974238161206),
+                                    ("tomorrow<time-of-day> am|pm", -6.05443934626937),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.045005314036012),
-                                    ("Diwaliyear (latent)", -6.045005314036012),
-                                    ("Black Fridayyear (latent)", -5.639540205927847),
+                                     -6.05443934626937),
+                                    ("Diwaliyear (latent)", -6.05443934626937),
+                                    ("Black Fridayyear (latent)", -5.648974238161206),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.045005314036012),
+                                     -6.05443934626937),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.045005314036012),
-                                    ("Chhathyear (latent)", -5.639540205927847),
-                                    ("Vasant Panchamiyear (latent)", -6.045005314036012),
-                                    ("Palm Sundayintersect", -6.045005314036012),
+                                     -6.05443934626937),
+                                    ("Chhathyear (latent)", -5.648974238161206),
+                                    ("Vasant Panchamiyear (latent)", -6.05443934626937),
+                                    ("Palm Sundayintersect", -6.05443934626937),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.045005314036012),
-                                    ("August Bank Holidayyear (latent)", -5.351858133476067),
-                                    ("Februaryintersect", -6.045005314036012),
-                                    ("Simchat Torahyear (latent)", -6.045005314036012),
-                                    ("minuteyear", -6.045005314036012)],
-                               n = 314},
+                                     -6.05443934626937),
+                                    ("August Bank Holidayyear (latent)", -5.3612921657094255),
+                                    ("Februaryintersect", -6.05443934626937),
+                                    ("Simchat Torahyear (latent)", -6.05443934626937),
+                                    ("minuteyear", -6.05443934626937)],
+                               n = 318},
                    koData =
-                     ClassData{prior = -0.969041297259684, unseen = -6.398594934535208,
+                     ClassData{prior = -0.9769153536905899, unseen = -6.398594934535208,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1348,15 +1345,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15616073075528253,
-                               unseen = -4.990432586778736,
+                     ClassData{prior = -0.15219181534192538,
+                               unseen = -5.017279836814924,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.196419909903219e-2),
-                                    ("intersect 2 numbers", -3.597312260588446)],
-                               n = 142},
+                                   [("integer (numeric)", -4.0821994520255166e-2),
+                                    ("intersect 2 numbers", -3.624340932976365)],
+                               n = 146},
                    koData =
-                     ClassData{prior = -1.9339339580085977, unseen = -3.367295829986474,
+                     ClassData{prior = -1.957744606702316, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.1349799328389845),
@@ -1413,8 +1410,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2101,8 +2098,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_IE.hs b/Duckling/Ranking/Classifiers/EN_IE.hs
index 4bc1f27a..d8d80444 100644
--- a/Duckling/Ranking/Classifiers/EN_IE.hs
+++ b/Duckling/Ranking/Classifiers/EN_IE.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_IN.hs b/Duckling/Ranking/Classifiers/EN_IN.hs
index 8a5c2465..8efde0c0 100644
--- a/Duckling/Ranking/Classifiers/EN_IN.hs
+++ b/Duckling/Ranking/Classifiers/EN_IN.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_JM.hs b/Duckling/Ranking/Classifiers/EN_JM.hs
index 6eee8cc6..76838164 100644
--- a/Duckling/Ranking/Classifiers/EN_JM.hs
+++ b/Duckling/Ranking/Classifiers/EN_JM.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_NZ.hs b/Duckling/Ranking/Classifiers/EN_NZ.hs
index 5acfad14..dcd46e60 100644
--- a/Duckling/Ranking/Classifiers/EN_NZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_NZ.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_PH.hs b/Duckling/Ranking/Classifiers/EN_PH.hs
index 27f9a350..33101a01 100644
--- a/Duckling/Ranking/Classifiers/EN_PH.hs
+++ b/Duckling/Ranking/Classifiers/EN_PH.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_TT.hs b/Duckling/Ranking/Classifiers/EN_TT.hs
index 85d37d97..c271a5d2 100644
--- a/Duckling/Ranking/Classifiers/EN_TT.hs
+++ b/Duckling/Ranking/Classifiers/EN_TT.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_US.hs b/Duckling/Ranking/Classifiers/EN_US.hs
index 59a0ae8c..4d1dec18 100644
--- a/Duckling/Ranking/Classifiers/EN_US.hs
+++ b/Duckling/Ranking/Classifiers/EN_US.hs
@@ -75,10 +75,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.572837664111602, unseen = -5.780743515792329,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 322},
+                     ClassData{prior = -0.5674726594306427, unseen = -5.793013608384143,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 326},
                    koData =
-                     ClassData{prior = -0.8299363131913027,
+                     ClassData{prior = -0.8369171443326427,
                                unseen = -5.5254529391317835,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 249}}),
        ("<year> (bc|ad)",
@@ -804,234 +804,233 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4533491943405983, unseen = -6.79346613258001,
+                     ClassData{prior = -0.4490133533538997, unseen = -6.802394763324311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.0991972469108635),
-                                    ("Father's Dayyear (latent)", -6.0991972469108635),
-                                    ("Ramadanyear (latent)", -6.0991972469108635),
+                                   [("Navaratriyear (latent)", -6.108135853911675),
+                                    ("Father's Dayyear (latent)", -6.108135853911675),
+                                    ("Ramadanyear (latent)", -6.108135853911675),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.846434278415496),
-                                    ("Military Spouse Dayyear (latent)", -6.0991972469108635),
-                                    ("Bhai Doojyear (latent)", -6.0991972469108635),
+                                     -4.855372885416307),
+                                    ("Military Spouse Dayyear (latent)", -6.108135853911675),
+                                    ("Bhai Doojyear (latent)", -6.108135853911675),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.846434278415496),
-                                    ("hourday", -4.394449154672439),
-                                    ("dayhour", -3.295836866004329),
-                                    ("Martin Luther King's Dayyear (latent)", -5.6937321388027),
-                                    ("Shemini Atzeretyear (latent)", -6.0991972469108635),
-                                    ("daymonth", -5.406050066350919),
-                                    ("monthday", -5.6937321388027),
-                                    ("monthyear", -4.307437777682809),
-                                    ("Yom Ha'atzmautyear (latent)", -6.0991972469108635),
-                                    ("Vijayadashamiyear (latent)", -6.0991972469108635),
+                                     -4.855372885416307),
+                                    ("hourday", -4.403387761673249), ("dayhour", -3.30477547300514),
+                                    ("Martin Luther King's Dayyear (latent)", -5.702670745803511),
+                                    ("Shemini Atzeretyear (latent)", -6.108135853911675),
+                                    ("daymonth", -5.41498867335173),
+                                    ("monthday", -5.702670745803511),
+                                    ("monthyear", -4.31637638468362),
+                                    ("Yom Ha'atzmautyear (latent)", -6.108135853911675),
+                                    ("Vijayadashamiyear (latent)", -6.108135853911675),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -4.712902885790974),
-                                    ("Thanksgiving Dayyear (latent)", -5.000584958242754),
-                                    ("Thai Pongalyear (latent)", -5.406050066350919),
-                                    ("Thiru Onamyear (latent)", -5.406050066350919),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.0991972469108635),
+                                     -4.721841492791785),
+                                    ("Thanksgiving Dayyear (latent)", -5.0095235652435655),
+                                    ("Thai Pongalyear (latent)", -5.41498867335173),
+                                    ("Thiru Onamyear (latent)", -5.41498867335173),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.108135853911675),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.0991972469108635),
-                                    ("houryear", -5.406050066350919),
+                                     -6.108135853911675),
+                                    ("houryear", -5.41498867335173),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.0991972469108635),
-                                    ("Christmas<time-of-day> am|pm", -6.0991972469108635),
+                                     -6.108135853911675),
+                                    ("Christmas<time-of-day> am|pm", -6.108135853911675),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.0991972469108635),
+                                     -6.108135853911675),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.406050066350919),
-                                    ("<time-of-day> am|pmintersect", -4.846434278415496),
-                                    ("Earth Houryear (latent)", -6.0991972469108635),
-                                    ("Octoberyear (latent)", -4.59511985013459),
-                                    ("intersect<time-of-day> am|pm", -6.0991972469108635),
-                                    ("Mattu Pongalyear (latent)", -6.0991972469108635),
-                                    ("Shavuotyear (latent)", -6.0991972469108635),
-                                    ("Dhanterasin <named-month>|year", -6.0991972469108635),
+                                     -5.41498867335173),
+                                    ("<time-of-day> am|pmintersect", -4.855372885416307),
+                                    ("Earth Houryear (latent)", -6.108135853911675),
+                                    ("Octoberyear (latent)", -4.604058457135401),
+                                    ("intersect<time-of-day> am|pm", -6.108135853911675),
+                                    ("Mattu Pongalyear (latent)", -6.108135853911675),
+                                    ("Shavuotyear (latent)", -6.108135853911675),
+                                    ("Dhanterasin <named-month>|year", -6.108135853911675),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.0991972469108635),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.0991972469108635),
+                                     -6.108135853911675),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.108135853911675),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.6937321388027),
-                                    ("Marchyear (latent)", -6.0991972469108635),
-                                    ("Sukkotyear (latent)", -5.6937321388027),
+                                     -5.702670745803511),
+                                    ("Marchyear (latent)", -6.108135853911675),
+                                    ("Sukkotyear (latent)", -5.702670745803511),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.0991972469108635),
-                                    ("Clean Mondayyear (latent)", -5.6937321388027),
-                                    ("monthhour", -5.6937321388027),
-                                    ("todayat <time-of-day>", -6.0991972469108635),
-                                    ("Thursday<time> timezone", -4.394449154672439),
+                                     -6.108135853911675),
+                                    ("Clean Mondayyear (latent)", -5.702670745803511),
+                                    ("monthhour", -5.702670745803511),
+                                    ("todayat <time-of-day>", -6.108135853911675),
+                                    ("Thursday<time> timezone", -4.403387761673249),
                                     ("Emergency Medical Services for Children Dayyear (latent)",
-                                     -6.0991972469108635),
+                                     -6.108135853911675),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.0991972469108635),
-                                    ("Palm SundaySunday", -5.6937321388027),
-                                    ("Tax Daythis|last|next <cycle>", -6.0991972469108635),
-                                    ("dayday", -3.9019726695746444),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.0991972469108635),
-                                    ("mm/ddat <time-of-day>", -6.0991972469108635),
-                                    ("tonightat <time-of-day>", -6.0991972469108635),
+                                     -6.108135853911675),
+                                    ("Palm SundaySunday", -5.702670745803511),
+                                    ("Tax Daythis|last|next <cycle>", -6.108135853911675),
+                                    ("dayday", -3.9109112765754555),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.108135853911675),
+                                    ("mm/ddat <time-of-day>", -6.108135853911675),
+                                    ("tonightat <time-of-day>", -6.108135853911675),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.406050066350919),
-                                    ("today<time-of-day> am|pm", -6.0991972469108635),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.6937321388027),
-                                    ("at <time-of-day><time> <part-of-day>", -6.0991972469108635),
-                                    ("mm/dd<time-of-day> am|pm", -6.0991972469108635),
-                                    ("hourhour", -4.846434278415496),
-                                    ("<time-of-day> am|pmon <date>", -4.084294226368599),
-                                    ("Wednesdaythis|last|next <cycle>", -6.0991972469108635),
-                                    ("Lentyear (latent)", -6.0991972469108635),
+                                     -5.41498867335173),
+                                    ("today<time-of-day> am|pm", -6.108135853911675),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.702670745803511),
+                                    ("at <time-of-day><time> <part-of-day>", -6.108135853911675),
+                                    ("mm/dd<time-of-day> am|pm", -6.108135853911675),
+                                    ("hourhour", -4.855372885416307),
+                                    ("<time-of-day> am|pmon <date>", -4.09323283336941),
+                                    ("Wednesdaythis|last|next <cycle>", -6.108135853911675),
+                                    ("Lentyear (latent)", -6.108135853911675),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.59511985013459),
-                                    ("Boghiyear (latent)", -6.0991972469108635),
-                                    ("dayyear", -1.8870696490323797),
-                                    ("Thursdayfrom|since|after <time>", -5.6937321388027),
+                                     -4.604058457135401),
+                                    ("Boghiyear (latent)", -6.108135853911675),
+                                    ("dayyear", -1.8668091013409285),
+                                    ("Thursdayfrom|since|after <time>", -5.702670745803511),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.0991972469108635),
-                                    ("Thursdayat <time-of-day>", -5.6937321388027),
-                                    ("Islamic New Yearyear (latent)", -5.6937321388027),
-                                    ("Laylat al-Qadryear (latent)", -5.182906515036709),
-                                    ("Chhathin <named-month>|year", -6.0991972469108635),
-                                    ("Vasant Panchamiin <named-month>|year", -6.0991972469108635),
-                                    ("Diwaliin <named-month>|year", -6.0991972469108635),
-                                    ("Shrove Tuesdayyear (latent)", -6.0991972469108635),
-                                    ("<time-of-day> am|pmtomorrow", -5.406050066350919),
-                                    ("Yom Kippuryear (latent)", -6.0991972469108635),
-                                    ("<part-of-day> of <time>year (latent)", -6.0991972469108635),
-                                    ("minutehour", -5.182906515036709),
-                                    ("Kaanum Pongalyear (latent)", -5.6937321388027),
-                                    ("Maha Saptamiyear (latent)", -6.0991972469108635),
+                                     -6.108135853911675),
+                                    ("Thursdayat <time-of-day>", -5.702670745803511),
+                                    ("Islamic New Yearyear (latent)", -5.702670745803511),
+                                    ("Laylat al-Qadryear (latent)", -5.1918451220375195),
+                                    ("Chhathin <named-month>|year", -6.108135853911675),
+                                    ("Vasant Panchamiin <named-month>|year", -6.108135853911675),
+                                    ("Diwaliin <named-month>|year", -6.108135853911675),
+                                    ("Shrove Tuesdayyear (latent)", -6.108135853911675),
+                                    ("<time-of-day> am|pmtomorrow", -5.41498867335173),
+                                    ("Yom Kippuryear (latent)", -6.108135853911675),
+                                    ("<part-of-day> of <time>year (latent)", -6.108135853911675),
+                                    ("minutehour", -5.1918451220375195),
+                                    ("Kaanum Pongalyear (latent)", -5.702670745803511),
+                                    ("Maha Saptamiyear (latent)", -6.108135853911675),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.6937321388027),
+                                     -5.702670745803511),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.394449154672439),
-                                    ("for <duration> from <time>December", -6.0991972469108635),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.0991972469108635),
+                                     -4.403387761673249),
+                                    ("for <duration> from <time>December", -6.108135853911675),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.108135853911675),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.182906515036709),
+                                     -5.1918451220375195),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.6937321388027),
-                                    ("Pentecostyear (latent)", -6.0991972469108635),
+                                     -5.702670745803511),
+                                    ("Pentecostyear (latent)", -6.108135853911675),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.182906515036709),
-                                    ("Eid al-Fitryear (latent)", -6.0991972469108635),
-                                    ("Mondayin|during the <part-of-day>", -6.0991972469108635),
-                                    ("Raksha Bandhanyear (latent)", -6.0991972469108635),
+                                     -5.1918451220375195),
+                                    ("Eid al-Fitryear (latent)", -6.108135853911675),
+                                    ("Mondayin|during the <part-of-day>", -6.108135853911675),
+                                    ("Raksha Bandhanyear (latent)", -6.108135853911675),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.6937321388027),
-                                    ("Emancipation Dayyear (latent)", -5.406050066350919),
-                                    ("Navaratriin <named-month>|year", -6.0991972469108635),
-                                    ("Ashurayear (latent)", -6.0991972469108635),
-                                    ("Chinese New Yearyear (latent)", -6.0991972469108635),
-                                    ("Sundayyear (latent)", -6.0991972469108635),
-                                    ("Lag BaOmeryear (latent)", -6.0991972469108635),
+                                     -5.702670745803511),
+                                    ("Emancipation Dayyear (latent)", -5.41498867335173),
+                                    ("Navaratriin <named-month>|year", -6.108135853911675),
+                                    ("Ashurayear (latent)", -6.108135853911675),
+                                    ("Chinese New Yearyear (latent)", -6.108135853911675),
+                                    ("Sundayyear (latent)", -6.108135853911675),
+                                    ("Lag BaOmeryear (latent)", -6.108135853911675),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.0991972469108635),
-                                    ("Eid al-Adhayear (latent)", -5.182906515036709),
-                                    ("intersectin|during the <part-of-day>", -6.0991972469108635),
-                                    ("Christmasat <time-of-day>", -6.0991972469108635),
-                                    ("Passoveryear (latent)", -6.0991972469108635),
-                                    ("Lazarus Saturdayyear (latent)", -6.0991972469108635),
+                                     -6.108135853911675),
+                                    ("Eid al-Adhayear (latent)", -5.1918451220375195),
+                                    ("intersectin|during the <part-of-day>", -6.108135853911675),
+                                    ("Christmasat <time-of-day>", -6.108135853911675),
+                                    ("Passoveryear (latent)", -6.108135853911675),
+                                    ("Lazarus Saturdayyear (latent)", -6.108135853911675),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.0991972469108635),
-                                    ("Cyber Mondayyear (latent)", -5.6937321388027),
-                                    ("Yom HaShoahyear (latent)", -5.6937321388027),
+                                     -6.108135853911675),
+                                    ("Cyber Mondayyear (latent)", -5.702670745803511),
+                                    ("Yom HaShoahyear (latent)", -5.702670745803511),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.6937321388027),
+                                     -5.702670745803511),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.0991972469108635),
-                                    ("Thai Pongalin <named-month>|year", -6.0991972469108635),
-                                    ("Septemberyear (latent)", -5.6937321388027),
-                                    ("mm/ddyear (latent)", -6.0991972469108635),
+                                     -6.108135853911675),
+                                    ("Thai Pongalin <named-month>|year", -6.108135853911675),
+                                    ("Septemberyear (latent)", -5.702670745803511),
+                                    ("mm/ddyear (latent)", -6.108135853911675),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.846434278415496),
-                                    ("Halloweenyear (latent)", -6.0991972469108635),
+                                     -4.855372885416307),
+                                    ("Halloweenyear (latent)", -6.108135853911675),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.6937321388027),
+                                     -5.702670745803511),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.406050066350919),
+                                     -5.41498867335173),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.182906515036709),
-                                    ("at <time-of-day>intersect", -5.6937321388027),
-                                    ("Rosh Hashanahyear (latent)", -6.0991972469108635),
-                                    ("Dhanterasyear (latent)", -6.0991972469108635),
-                                    ("Tu BiShvatyear (latent)", -6.0991972469108635),
-                                    ("Holiyear (latent)", -5.406050066350919),
+                                     -5.1918451220375195),
+                                    ("at <time-of-day>intersect", -5.702670745803511),
+                                    ("Rosh Hashanahyear (latent)", -5.41498867335173),
+                                    ("Dhanterasyear (latent)", -6.108135853911675),
+                                    ("Tu BiShvatyear (latent)", -6.108135853911675),
+                                    ("Holiyear (latent)", -5.41498867335173),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.0991972469108635),
-                                    ("Holika Dahanyear (latent)", -5.406050066350919),
+                                     -6.108135853911675),
+                                    ("Holika Dahanyear (latent)", -5.41498867335173),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.0991972469108635),
-                                    ("dayminute", -3.460139917295605),
-                                    ("Mawlidyear (latent)", -6.0991972469108635),
+                                     -6.108135853911675),
+                                    ("dayminute", -3.469078524296416),
+                                    ("Mawlidyear (latent)", -6.108135853911675),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.6937321388027),
+                                     -5.702670745803511),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.0991972469108635),
-                                    ("Jumu'atul-Widayear (latent)", -5.182906515036709),
+                                     -6.108135853911675),
+                                    ("Jumu'atul-Widayear (latent)", -5.1918451220375195),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.0991972469108635),
-                                    ("minuteday", -2.4616110871844783),
+                                     -6.108135853911675),
+                                    ("minuteday", -2.4705496941852894),
                                     ("absorption of , after named dayintersect",
-                                     -6.0991972469108635),
-                                    ("intersectyear (latent)", -6.0991972469108635),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.0991972469108635),
+                                     -6.108135853911675),
+                                    ("intersectyear (latent)", -6.108135853911675),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.108135853911675),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.0991972469108635),
+                                     -6.108135853911675),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.0991972469108635),
-                                    ("Boss's Dayyear (latent)", -5.6937321388027),
-                                    ("Global Youth Service Dayyear (latent)", -6.0991972469108635),
-                                    ("Tisha B'Avyear (latent)", -6.0991972469108635),
-                                    ("Isra and Mi'rajyear (latent)", -5.182906515036709),
+                                     -6.108135853911675),
+                                    ("Boss's Dayyear (latent)", -5.702670745803511),
+                                    ("Global Youth Service Dayyear (latent)", -6.108135853911675),
+                                    ("Tisha B'Avyear (latent)", -6.108135853911675),
+                                    ("Isra and Mi'rajyear (latent)", -5.1918451220375195),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.0991972469108635),
-                                    ("Christmasyear (latent)", -5.6937321388027),
-                                    ("Naraka Chaturdashiyear (latent)", -5.6937321388027),
-                                    ("at <time-of-day>on <date>", -5.000584958242754),
+                                     -6.108135853911675),
+                                    ("Christmasyear (latent)", -5.702670745803511),
+                                    ("Naraka Chaturdashiyear (latent)", -5.702670745803511),
+                                    ("at <time-of-day>on <date>", -5.0095235652435655),
                                     ("Emergency Medical Services Weekyear (latent)",
-                                     -6.0991972469108635),
+                                     -6.108135853911675),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.489759334476764),
-                                    ("dayweek", -6.0991972469108635),
-                                    ("Easter Sundayyear (latent)", -5.406050066350919),
-                                    ("weekyear", -5.000584958242754),
-                                    ("hh:mmin|during the <part-of-day>", -5.406050066350919),
+                                     -4.498697941477575),
+                                    ("dayweek", -6.108135853911675),
+                                    ("Easter Sundayyear (latent)", -5.41498867335173),
+                                    ("weekyear", -5.0095235652435655),
+                                    ("hh:mmin|during the <part-of-day>", -5.41498867335173),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.6937321388027),
-                                    ("Hanukkahyear (latent)", -6.0991972469108635),
-                                    ("February<time> <part-of-day>", -6.0991972469108635),
-                                    ("National Grandparents Dayyear (latent)", -6.0991972469108635),
-                                    ("Tuesdayin <named-month>|year", -6.0991972469108635),
-                                    ("Great Lentyear (latent)", -6.0991972469108635),
-                                    ("tomorrowat <time-of-day>", -5.406050066350919),
-                                    ("Labor Dayyear (latent)", -6.0991972469108635),
-                                    ("between <time> and <time>on <date>", -4.489759334476764),
-                                    ("last <cycle> of <time>year (latent)", -5.406050066350919),
-                                    ("at <time-of-day>tomorrow", -5.6937321388027),
-                                    ("tomorrow<time-of-day> am|pm", -6.0991972469108635),
-                                    ("President's Dayyear (latent)", -6.0991972469108635),
+                                     -5.702670745803511),
+                                    ("Hanukkahyear (latent)", -5.41498867335173),
+                                    ("February<time> <part-of-day>", -6.108135853911675),
+                                    ("National Grandparents Dayyear (latent)", -6.108135853911675),
+                                    ("Tuesdayin <named-month>|year", -6.108135853911675),
+                                    ("Great Lentyear (latent)", -6.108135853911675),
+                                    ("tomorrowat <time-of-day>", -5.41498867335173),
+                                    ("Labor Dayyear (latent)", -6.108135853911675),
+                                    ("between <time> and <time>on <date>", -4.498697941477575),
+                                    ("last <cycle> of <time>year (latent)", -5.41498867335173),
+                                    ("at <time-of-day>tomorrow", -5.702670745803511),
+                                    ("tomorrow<time-of-day> am|pm", -6.108135853911675),
+                                    ("President's Dayyear (latent)", -6.108135853911675),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.0991972469108635),
-                                    ("Diwaliyear (latent)", -6.0991972469108635),
-                                    ("Black Fridayyear (latent)", -5.6937321388027),
+                                     -6.108135853911675),
+                                    ("Diwaliyear (latent)", -6.108135853911675),
+                                    ("Black Fridayyear (latent)", -5.702670745803511),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.0991972469108635),
+                                     -6.108135853911675),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.0991972469108635),
-                                    ("Chhathyear (latent)", -5.6937321388027),
-                                    ("Vasant Panchamiyear (latent)", -6.0991972469108635),
-                                    ("Palm Sundayintersect", -6.0991972469108635),
-                                    ("Tax Dayyear (latent)", -5.182906515036709),
+                                     -6.108135853911675),
+                                    ("Chhathyear (latent)", -5.702670745803511),
+                                    ("Vasant Panchamiyear (latent)", -6.108135853911675),
+                                    ("Palm Sundayintersect", -6.108135853911675),
+                                    ("Tax Dayyear (latent)", -5.1918451220375195),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.0991972469108635),
-                                    ("Februaryintersect", -6.0991972469108635),
-                                    ("Mother's Dayyear (latent)", -6.0991972469108635),
-                                    ("Simchat Torahyear (latent)", -6.0991972469108635),
-                                    ("minuteyear", -6.0991972469108635)],
-                               n = 333},
+                                     -6.108135853911675),
+                                    ("Februaryintersect", -6.108135853911675),
+                                    ("Mother's Dayyear (latent)", -6.108135853911675),
+                                    ("Simchat Torahyear (latent)", -6.108135853911675),
+                                    ("minuteyear", -6.108135853911675)],
+                               n = 337},
                    koData =
-                     ClassData{prior = -1.0092182562744123, unseen = -6.410174881966167,
+                     ClassData{prior = -1.0168228556596315, unseen = -6.410174881966167,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1368,15 +1367,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.13895146009386183,
-                               unseen = -5.111987788356543,
+                     ClassData{prior = -0.13580154115906176,
+                               unseen = -5.135798437050262,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -3.70412716803491e-2),
-                                    ("intersect 2 numbers", -3.71965111278069)],
-                               n = 161},
+                                   [("integer (numeric)", -3.614851411631109e-2),
+                                    ("intersect 2 numbers", -3.7436043538031827)],
+                               n = 165},
                    koData =
-                     ClassData{prior = -2.042301994730379, unseen = -3.367295829986474,
+                     ClassData{prior = -2.063693184711697, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.1349799328389845),
@@ -1447,8 +1446,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2174,8 +2173,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_XX.hs b/Duckling/Ranking/Classifiers/EN_XX.hs
index b3fab047..83e507e4 100644
--- a/Duckling/Ranking/Classifiers/EN_XX.hs
+++ b/Duckling/Ranking/Classifiers/EN_XX.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5973385376731054, unseen = -5.713732805509369,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 301},
+                     ClassData{prior = -0.5914230325455029, unseen = -5.726847747587197,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 305},
                    koData =
-                     ClassData{prior = -0.7991172664896184,
+                     ClassData{prior = -0.8064032732205517,
                                unseen = -5.5134287461649825,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 246}}),
        ("<year> (bc|ad)",
@@ -788,218 +788,218 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4784902431230543, unseen = -6.720220155135295,
+                     ClassData{prior = -0.4736029132753824, unseen = -6.729824070489475,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.025865973825314),
-                                    ("Ramadanyear (latent)", -6.025865973825314),
+                                   [("Navaratriyear (latent)", -6.035481432524756),
+                                    ("Ramadanyear (latent)", -6.035481432524756),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.773103005329946),
-                                    ("Bhai Doojyear (latent)", -6.025865973825314),
+                                     -4.782718464029388),
+                                    ("Bhai Doojyear (latent)", -6.035481432524756),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.773103005329946),
-                                    ("hourday", -4.321117881586889),
-                                    ("dayhour", -3.2225055929187794),
-                                    ("Martin Luther King's Dayyear (latent)", -5.62040086571715),
-                                    ("Shemini Atzeretyear (latent)", -6.025865973825314),
-                                    ("daymonth", -5.332718793265369),
-                                    ("monthday", -5.62040086571715),
-                                    ("monthyear", -4.23410650459726),
-                                    ("Yom Ha'atzmautyear (latent)", -6.025865973825314),
-                                    ("Vijayadashamiyear (latent)", -6.025865973825314),
-                                    ("Thanksgiving Dayyear (latent)", -4.927253685157205),
-                                    ("Thai Pongalyear (latent)", -5.332718793265369),
-                                    ("Thiru Onamyear (latent)", -5.332718793265369),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.025865973825314),
+                                     -4.782718464029388),
+                                    ("hourday", -4.330733340286331),
+                                    ("dayhour", -3.2321210516182215),
+                                    ("Martin Luther King's Dayyear (latent)", -5.630016324416592),
+                                    ("Shemini Atzeretyear (latent)", -6.035481432524756),
+                                    ("daymonth", -5.342334251964811),
+                                    ("monthday", -5.630016324416592),
+                                    ("monthyear", -4.243721963296701),
+                                    ("Yom Ha'atzmautyear (latent)", -6.035481432524756),
+                                    ("Vijayadashamiyear (latent)", -6.035481432524756),
+                                    ("Thanksgiving Dayyear (latent)", -4.936869143856646),
+                                    ("Thai Pongalyear (latent)", -5.342334251964811),
+                                    ("Thiru Onamyear (latent)", -5.342334251964811),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.035481432524756),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.025865973825314),
-                                    ("houryear", -5.332718793265369),
+                                     -6.035481432524756),
+                                    ("houryear", -5.342334251964811),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.025865973825314),
-                                    ("Christmas<time-of-day> am|pm", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("Christmas<time-of-day> am|pm", -6.035481432524756),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.025865973825314),
+                                     -6.035481432524756),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.332718793265369),
-                                    ("<time-of-day> am|pmintersect", -4.773103005329946),
-                                    ("Earth Houryear (latent)", -6.025865973825314),
-                                    ("Octoberyear (latent)", -4.5217885770490405),
-                                    ("intersect<time-of-day> am|pm", -6.025865973825314),
-                                    ("Mattu Pongalyear (latent)", -6.025865973825314),
-                                    ("Shavuotyear (latent)", -6.025865973825314),
-                                    ("Dhanterasin <named-month>|year", -6.025865973825314),
+                                     -5.342334251964811),
+                                    ("<time-of-day> am|pmintersect", -4.782718464029388),
+                                    ("Earth Houryear (latent)", -6.035481432524756),
+                                    ("Octoberyear (latent)", -4.531404035748483),
+                                    ("intersect<time-of-day> am|pm", -6.035481432524756),
+                                    ("Mattu Pongalyear (latent)", -6.035481432524756),
+                                    ("Shavuotyear (latent)", -6.035481432524756),
+                                    ("Dhanterasin <named-month>|year", -6.035481432524756),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.025865973825314),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.035481432524756),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.62040086571715),
-                                    ("Marchyear (latent)", -6.025865973825314),
-                                    ("Sukkotyear (latent)", -5.62040086571715),
+                                     -5.630016324416592),
+                                    ("Marchyear (latent)", -6.035481432524756),
+                                    ("Sukkotyear (latent)", -5.630016324416592),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.025865973825314),
-                                    ("Clean Mondayyear (latent)", -5.62040086571715),
-                                    ("monthhour", -5.62040086571715),
-                                    ("todayat <time-of-day>", -6.025865973825314),
-                                    ("Thursday<time> timezone", -4.321117881586889),
+                                     -6.035481432524756),
+                                    ("Clean Mondayyear (latent)", -5.630016324416592),
+                                    ("monthhour", -5.630016324416592),
+                                    ("todayat <time-of-day>", -6.035481432524756),
+                                    ("Thursday<time> timezone", -4.330733340286331),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.025865973825314),
-                                    ("Palm SundaySunday", -5.62040086571715),
-                                    ("dayday", -3.828641396489095),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.025865973825314),
-                                    ("mm/ddat <time-of-day>", -6.025865973825314),
-                                    ("tonightat <time-of-day>", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("Palm SundaySunday", -5.630016324416592),
+                                    ("dayday", -3.8382568551885368),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.035481432524756),
+                                    ("mm/ddat <time-of-day>", -6.035481432524756),
+                                    ("tonightat <time-of-day>", -6.035481432524756),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.332718793265369),
-                                    ("today<time-of-day> am|pm", -6.025865973825314),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.62040086571715),
-                                    ("at <time-of-day><time> <part-of-day>", -6.025865973825314),
-                                    ("mm/dd<time-of-day> am|pm", -6.025865973825314),
-                                    ("hourhour", -4.773103005329946),
-                                    ("<time-of-day> am|pmon <date>", -4.01096295328305),
-                                    ("Wednesdaythis|last|next <cycle>", -6.025865973825314),
-                                    ("Lentyear (latent)", -6.025865973825314),
+                                     -5.342334251964811),
+                                    ("today<time-of-day> am|pm", -6.035481432524756),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.630016324416592),
+                                    ("at <time-of-day><time> <part-of-day>", -6.035481432524756),
+                                    ("mm/dd<time-of-day> am|pm", -6.035481432524756),
+                                    ("hourhour", -4.782718464029388),
+                                    ("<time-of-day> am|pmon <date>", -4.020578411982491),
+                                    ("Wednesdaythis|last|next <cycle>", -6.035481432524756),
+                                    ("Lentyear (latent)", -6.035481432524756),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.5217885770490405),
-                                    ("Boghiyear (latent)", -6.025865973825314),
-                                    ("dayyear", -2.0185327885928435),
-                                    ("Thursdayfrom|since|after <time>", -5.62040086571715),
+                                     -4.531404035748483),
+                                    ("Boghiyear (latent)", -6.035481432524756),
+                                    ("dayyear", -1.9924301646902063),
+                                    ("Thursdayfrom|since|after <time>", -5.630016324416592),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.025865973825314),
-                                    ("Thursdayat <time-of-day>", -5.62040086571715),
-                                    ("Islamic New Yearyear (latent)", -5.62040086571715),
-                                    ("Laylat al-Qadryear (latent)", -5.109575241951159),
-                                    ("Chhathin <named-month>|year", -6.025865973825314),
-                                    ("Vasant Panchamiin <named-month>|year", -6.025865973825314),
-                                    ("Diwaliin <named-month>|year", -6.025865973825314),
-                                    ("Shrove Tuesdayyear (latent)", -6.025865973825314),
-                                    ("<time-of-day> am|pmtomorrow", -5.332718793265369),
-                                    ("Yom Kippuryear (latent)", -6.025865973825314),
-                                    ("<part-of-day> of <time>year (latent)", -6.025865973825314),
-                                    ("minutehour", -5.109575241951159),
-                                    ("Kaanum Pongalyear (latent)", -5.62040086571715),
-                                    ("Maha Saptamiyear (latent)", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("Thursdayat <time-of-day>", -5.630016324416592),
+                                    ("Islamic New Yearyear (latent)", -5.630016324416592),
+                                    ("Laylat al-Qadryear (latent)", -5.119190700650601),
+                                    ("Chhathin <named-month>|year", -6.035481432524756),
+                                    ("Vasant Panchamiin <named-month>|year", -6.035481432524756),
+                                    ("Diwaliin <named-month>|year", -6.035481432524756),
+                                    ("Shrove Tuesdayyear (latent)", -6.035481432524756),
+                                    ("<time-of-day> am|pmtomorrow", -5.342334251964811),
+                                    ("Yom Kippuryear (latent)", -6.035481432524756),
+                                    ("<part-of-day> of <time>year (latent)", -6.035481432524756),
+                                    ("minutehour", -5.119190700650601),
+                                    ("Kaanum Pongalyear (latent)", -5.630016324416592),
+                                    ("Maha Saptamiyear (latent)", -6.035481432524756),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.62040086571715),
+                                     -5.630016324416592),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.321117881586889),
-                                    ("for <duration> from <time>December", -6.025865973825314),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.025865973825314),
+                                     -4.330733340286331),
+                                    ("for <duration> from <time>December", -6.035481432524756),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.035481432524756),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.109575241951159),
+                                     -5.119190700650601),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.62040086571715),
-                                    ("Pentecostyear (latent)", -6.025865973825314),
+                                     -5.630016324416592),
+                                    ("Pentecostyear (latent)", -6.035481432524756),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.109575241951159),
-                                    ("Eid al-Fitryear (latent)", -6.025865973825314),
-                                    ("Mondayin|during the <part-of-day>", -6.025865973825314),
-                                    ("Raksha Bandhanyear (latent)", -6.025865973825314),
+                                     -5.119190700650601),
+                                    ("Eid al-Fitryear (latent)", -6.035481432524756),
+                                    ("Mondayin|during the <part-of-day>", -6.035481432524756),
+                                    ("Raksha Bandhanyear (latent)", -6.035481432524756),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.62040086571715),
-                                    ("Navaratriin <named-month>|year", -6.025865973825314),
-                                    ("Ashurayear (latent)", -6.025865973825314),
-                                    ("Chinese New Yearyear (latent)", -6.025865973825314),
-                                    ("Sundayyear (latent)", -6.025865973825314),
-                                    ("Lag BaOmeryear (latent)", -6.025865973825314),
+                                     -5.630016324416592),
+                                    ("Navaratriin <named-month>|year", -6.035481432524756),
+                                    ("Ashurayear (latent)", -6.035481432524756),
+                                    ("Chinese New Yearyear (latent)", -6.035481432524756),
+                                    ("Sundayyear (latent)", -6.035481432524756),
+                                    ("Lag BaOmeryear (latent)", -6.035481432524756),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.025865973825314),
-                                    ("Eid al-Adhayear (latent)", -5.109575241951159),
-                                    ("intersectin|during the <part-of-day>", -6.025865973825314),
-                                    ("Christmasat <time-of-day>", -6.025865973825314),
-                                    ("Passoveryear (latent)", -6.025865973825314),
-                                    ("Lazarus Saturdayyear (latent)", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("Eid al-Adhayear (latent)", -5.119190700650601),
+                                    ("intersectin|during the <part-of-day>", -6.035481432524756),
+                                    ("Christmasat <time-of-day>", -6.035481432524756),
+                                    ("Passoveryear (latent)", -6.035481432524756),
+                                    ("Lazarus Saturdayyear (latent)", -6.035481432524756),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.025865973825314),
-                                    ("Yom HaShoahyear (latent)", -5.62040086571715),
+                                     -6.035481432524756),
+                                    ("Yom HaShoahyear (latent)", -5.630016324416592),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.62040086571715),
+                                     -5.630016324416592),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.025865973825314),
-                                    ("Thai Pongalin <named-month>|year", -6.025865973825314),
-                                    ("Septemberyear (latent)", -5.62040086571715),
-                                    ("mm/ddyear (latent)", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("Thai Pongalin <named-month>|year", -6.035481432524756),
+                                    ("Septemberyear (latent)", -5.630016324416592),
+                                    ("mm/ddyear (latent)", -6.035481432524756),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.773103005329946),
-                                    ("Halloweenyear (latent)", -6.025865973825314),
+                                     -4.782718464029388),
+                                    ("Halloweenyear (latent)", -6.035481432524756),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.62040086571715),
+                                     -5.630016324416592),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.332718793265369),
+                                     -5.342334251964811),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.109575241951159),
-                                    ("at <time-of-day>intersect", -5.62040086571715),
-                                    ("Rosh Hashanahyear (latent)", -6.025865973825314),
-                                    ("Dhanterasyear (latent)", -6.025865973825314),
-                                    ("Tu BiShvatyear (latent)", -6.025865973825314),
-                                    ("Holiyear (latent)", -5.332718793265369),
+                                     -5.119190700650601),
+                                    ("at <time-of-day>intersect", -5.630016324416592),
+                                    ("Rosh Hashanahyear (latent)", -5.342334251964811),
+                                    ("Dhanterasyear (latent)", -6.035481432524756),
+                                    ("Tu BiShvatyear (latent)", -6.035481432524756),
+                                    ("Holiyear (latent)", -5.342334251964811),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.025865973825314),
-                                    ("Holika Dahanyear (latent)", -5.332718793265369),
+                                     -6.035481432524756),
+                                    ("Holika Dahanyear (latent)", -5.342334251964811),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.025865973825314),
-                                    ("dayminute", -3.386808644210056),
-                                    ("Mawlidyear (latent)", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("dayminute", -3.3964241029094975),
+                                    ("Mawlidyear (latent)", -6.035481432524756),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.62040086571715),
+                                     -5.630016324416592),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.025865973825314),
-                                    ("Jumu'atul-Widayear (latent)", -5.109575241951159),
+                                     -6.035481432524756),
+                                    ("Jumu'atul-Widayear (latent)", -5.119190700650601),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.025865973825314),
-                                    ("minuteday", -2.3882798140989285),
+                                     -6.035481432524756),
+                                    ("minuteday", -2.3978952727983707),
                                     ("absorption of , after named dayintersect",
-                                     -6.025865973825314),
-                                    ("intersectyear (latent)", -6.025865973825314),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("intersectyear (latent)", -6.035481432524756),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.035481432524756),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.025865973825314),
+                                     -6.035481432524756),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.025865973825314),
-                                    ("Boss's Dayyear (latent)", -5.62040086571715),
-                                    ("Global Youth Service Dayyear (latent)", -6.025865973825314),
-                                    ("Tisha B'Avyear (latent)", -6.025865973825314),
-                                    ("Isra and Mi'rajyear (latent)", -5.109575241951159),
+                                     -6.035481432524756),
+                                    ("Boss's Dayyear (latent)", -5.630016324416592),
+                                    ("Global Youth Service Dayyear (latent)", -6.035481432524756),
+                                    ("Tisha B'Avyear (latent)", -6.035481432524756),
+                                    ("Isra and Mi'rajyear (latent)", -5.119190700650601),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.025865973825314),
-                                    ("Christmasyear (latent)", -5.62040086571715),
-                                    ("Naraka Chaturdashiyear (latent)", -5.62040086571715),
-                                    ("at <time-of-day>on <date>", -4.927253685157205),
+                                     -6.035481432524756),
+                                    ("Christmasyear (latent)", -5.630016324416592),
+                                    ("Naraka Chaturdashiyear (latent)", -5.630016324416592),
+                                    ("at <time-of-day>on <date>", -4.936869143856646),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.416428061391214),
-                                    ("dayweek", -6.025865973825314),
-                                    ("Easter Sundayyear (latent)", -5.332718793265369),
-                                    ("weekyear", -4.927253685157205),
-                                    ("hh:mmin|during the <part-of-day>", -5.332718793265369),
+                                     -4.426043520090656),
+                                    ("dayweek", -6.035481432524756),
+                                    ("Easter Sundayyear (latent)", -5.342334251964811),
+                                    ("weekyear", -4.936869143856646),
+                                    ("hh:mmin|during the <part-of-day>", -5.342334251964811),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.62040086571715),
-                                    ("Hanukkahyear (latent)", -6.025865973825314),
-                                    ("February<time> <part-of-day>", -6.025865973825314),
-                                    ("Tuesdayin <named-month>|year", -6.025865973825314),
-                                    ("Great Lentyear (latent)", -6.025865973825314),
-                                    ("tomorrowat <time-of-day>", -5.332718793265369),
-                                    ("between <time> and <time>on <date>", -4.416428061391214),
-                                    ("last <cycle> of <time>year (latent)", -5.332718793265369),
-                                    ("at <time-of-day>tomorrow", -5.62040086571715),
-                                    ("tomorrow<time-of-day> am|pm", -6.025865973825314),
+                                     -5.630016324416592),
+                                    ("Hanukkahyear (latent)", -5.342334251964811),
+                                    ("February<time> <part-of-day>", -6.035481432524756),
+                                    ("Tuesdayin <named-month>|year", -6.035481432524756),
+                                    ("Great Lentyear (latent)", -6.035481432524756),
+                                    ("tomorrowat <time-of-day>", -5.342334251964811),
+                                    ("between <time> and <time>on <date>", -4.426043520090656),
+                                    ("last <cycle> of <time>year (latent)", -5.342334251964811),
+                                    ("at <time-of-day>tomorrow", -5.630016324416592),
+                                    ("tomorrow<time-of-day> am|pm", -6.035481432524756),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.025865973825314),
-                                    ("Diwaliyear (latent)", -6.025865973825314),
-                                    ("Black Fridayyear (latent)", -5.62040086571715),
+                                     -6.035481432524756),
+                                    ("Diwaliyear (latent)", -6.035481432524756),
+                                    ("Black Fridayyear (latent)", -5.630016324416592),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.025865973825314),
+                                     -6.035481432524756),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.025865973825314),
-                                    ("Chhathyear (latent)", -5.62040086571715),
-                                    ("Vasant Panchamiyear (latent)", -6.025865973825314),
-                                    ("Palm Sundayintersect", -6.025865973825314),
+                                     -6.035481432524756),
+                                    ("Chhathyear (latent)", -5.630016324416592),
+                                    ("Vasant Panchamiyear (latent)", -6.035481432524756),
+                                    ("Palm Sundayintersect", -6.035481432524756),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.025865973825314),
-                                    ("Februaryintersect", -6.025865973825314),
-                                    ("Simchat Torahyear (latent)", -6.025865973825314),
-                                    ("minuteyear", -6.025865973825314)],
-                               n = 308},
+                                     -6.035481432524756),
+                                    ("Februaryintersect", -6.035481432524756),
+                                    ("Simchat Torahyear (latent)", -6.035481432524756),
+                                    ("minuteyear", -6.035481432524756)],
+                               n = 312},
                    koData =
-                     ClassData{prior = -0.9668430110369863,
+                     ClassData{prior = -0.9748590860252225,
                                unseen = -6.3818160174060985,
                                likelihoods =
                                  HashMap.fromList
@@ -1334,15 +1334,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16251892949777494,
-                               unseen = -4.948759890378168,
+                     ClassData{prior = -0.15822400521489416,
+                               unseen = -4.976733742420574,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.380262265839289e-2),
-                                    ("intersect 2 numbers", -3.5553480614894135)],
-                               n = 136},
+                                   [("integer (numeric)", -4.255961441879589e-2),
+                                    ("intersect 2 numbers", -3.58351893845611)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.8971199848858813, unseen = -3.367295829986474,
+                     ClassData{prior = -1.9218125974762528, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.1349799328389845),
@@ -1392,8 +1392,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2064,8 +2064,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Ranking/Classifiers/EN_ZA.hs b/Duckling/Ranking/Classifiers/EN_ZA.hs
index 1c5213c3..ca281706 100644
--- a/Duckling/Ranking/Classifiers/EN_ZA.hs
+++ b/Duckling/Ranking/Classifiers/EN_ZA.hs
@@ -68,10 +68,10 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5664886672231848, unseen = -5.676753802268282,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 290},
+                     ClassData{prior = -0.5605871333250545, unseen = -5.69035945432406,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 294},
                    koData =
-                     ClassData{prior = -0.8382068886859517, unseen = -5.407171771460119,
+                     ClassData{prior = -0.8460041991459833, unseen = -5.407171771460119,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 221}}),
        ("<year> (bc|ad)",
         Classifier{okData =
@@ -780,215 +780,215 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47830243206043055,
-                               unseen = -6.694562058521095,
+                     ClassData{prior = -0.4732877044469254, unseen = -6.704414354964107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.000176487710004),
-                                    ("Ramadanyear (latent)", -6.000176487710004),
+                                   [("Navaratriyear (latent)", -6.010040932680917),
+                                    ("Ramadanyear (latent)", -6.010040932680917),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("Bhai Doojyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Bhai Doojyear (latent)", -6.010040932680917),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.747413519214636),
-                                    ("hourday", -4.295428395471578),
-                                    ("dayhour", -3.1968161068034684),
-                                    ("Martin Luther King's Dayyear (latent)", -5.594711379601839),
-                                    ("Shemini Atzeretyear (latent)", -6.000176487710004),
-                                    ("daymonth", -5.307029307150058),
-                                    ("monthday", -5.594711379601839),
-                                    ("monthyear", -4.208417018481948),
-                                    ("Yom Ha'atzmautyear (latent)", -6.000176487710004),
-                                    ("Vijayadashamiyear (latent)", -6.000176487710004),
-                                    ("Thai Pongalyear (latent)", -5.307029307150058),
-                                    ("Thiru Onamyear (latent)", -5.307029307150058),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("hourday", -4.305292840442492),
+                                    ("dayhour", -3.2066805517743826),
+                                    ("Martin Luther King's Dayyear (latent)", -5.604575824572753),
+                                    ("Shemini Atzeretyear (latent)", -6.010040932680917),
+                                    ("daymonth", -5.316893752120972),
+                                    ("monthday", -5.604575824572753),
+                                    ("monthyear", -4.218281463452862),
+                                    ("Yom Ha'atzmautyear (latent)", -6.010040932680917),
+                                    ("Vijayadashamiyear (latent)", -6.010040932680917),
+                                    ("Thai Pongalyear (latent)", -5.316893752120972),
+                                    ("Thiru Onamyear (latent)", -5.316893752120972),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.000176487710004),
-                                    ("houryear", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("houryear", -5.316893752120972),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Christmas<time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Christmas<time-of-day> am|pm", -6.010040932680917),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.307029307150058),
-                                    ("<time-of-day> am|pmintersect", -4.747413519214636),
-                                    ("Earth Houryear (latent)", -6.000176487710004),
-                                    ("Octoberyear (latent)", -4.496099090933729),
-                                    ("intersect<time-of-day> am|pm", -6.000176487710004),
-                                    ("Mattu Pongalyear (latent)", -6.000176487710004),
-                                    ("Shavuotyear (latent)", -6.000176487710004),
-                                    ("Dhanterasin <named-month>|year", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("<time-of-day> am|pmintersect", -4.757277964185549),
+                                    ("Earth Houryear (latent)", -6.010040932680917),
+                                    ("Octoberyear (latent)", -4.505963535904644),
+                                    ("intersect<time-of-day> am|pm", -6.010040932680917),
+                                    ("Mattu Pongalyear (latent)", -6.010040932680917),
+                                    ("Shavuotyear (latent)", -6.010040932680917),
+                                    ("Dhanterasin <named-month>|year", -6.010040932680917),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.000176487710004),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.594711379601839),
-                                    ("Marchyear (latent)", -6.000176487710004),
-                                    ("Sukkotyear (latent)", -5.594711379601839),
+                                     -5.604575824572753),
+                                    ("Marchyear (latent)", -6.010040932680917),
+                                    ("Sukkotyear (latent)", -5.604575824572753),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.000176487710004),
-                                    ("Clean Mondayyear (latent)", -5.594711379601839),
-                                    ("monthhour", -5.594711379601839),
-                                    ("todayat <time-of-day>", -6.000176487710004),
-                                    ("Thursday<time> timezone", -4.295428395471578),
+                                     -6.010040932680917),
+                                    ("Clean Mondayyear (latent)", -5.604575824572753),
+                                    ("monthhour", -5.604575824572753),
+                                    ("todayat <time-of-day>", -6.010040932680917),
+                                    ("Thursday<time> timezone", -4.305292840442492),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.000176487710004),
-                                    ("Palm SundaySunday", -5.594711379601839),
-                                    ("dayday", -3.802951910373784),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.000176487710004),
-                                    ("tonightat <time-of-day>", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Palm SundaySunday", -5.604575824572753),
+                                    ("dayday", -3.812816355344698),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.010040932680917),
+                                    ("tonightat <time-of-day>", -6.010040932680917),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.307029307150058),
-                                    ("today<time-of-day> am|pm", -6.000176487710004),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.594711379601839),
-                                    ("at <time-of-day><time> <part-of-day>", -6.000176487710004),
-                                    ("hourhour", -4.747413519214636),
-                                    ("<time-of-day> am|pmon <date>", -3.9852734671677386),
-                                    ("Wednesdaythis|last|next <cycle>", -6.000176487710004),
-                                    ("Lentyear (latent)", -6.000176487710004),
+                                     -5.316893752120972),
+                                    ("today<time-of-day> am|pm", -6.010040932680917),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.604575824572753),
+                                    ("at <time-of-day><time> <part-of-day>", -6.010040932680917),
+                                    ("hourhour", -4.757277964185549),
+                                    ("<time-of-day> am|pmon <date>", -3.9951379121386528),
+                                    ("Wednesdaythis|last|next <cycle>", -6.010040932680917),
+                                    ("Lentyear (latent)", -6.010040932680917),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.496099090933729),
-                                    ("Boghiyear (latent)", -6.000176487710004),
-                                    ("dayyear", -2.048932769128576),
-                                    ("Thursdayfrom|since|after <time>", -5.594711379601839),
+                                     -4.505963535904644),
+                                    ("Boghiyear (latent)", -6.010040932680917),
+                                    ("dayyear", -2.021056886116643),
+                                    ("Thursdayfrom|since|after <time>", -5.604575824572753),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thursdayat <time-of-day>", -5.594711379601839),
-                                    ("Islamic New Yearyear (latent)", -5.594711379601839),
-                                    ("Laylat al-Qadryear (latent)", -5.083885755835849),
-                                    ("Chhathin <named-month>|year", -6.000176487710004),
-                                    ("Vasant Panchamiin <named-month>|year", -6.000176487710004),
-                                    ("Diwaliin <named-month>|year", -6.000176487710004),
-                                    ("Shrove Tuesdayyear (latent)", -6.000176487710004),
-                                    ("<time-of-day> am|pmtomorrow", -5.307029307150058),
-                                    ("Yom Kippuryear (latent)", -6.000176487710004),
-                                    ("<part-of-day> of <time>year (latent)", -6.000176487710004),
-                                    ("minutehour", -5.083885755835849),
-                                    ("Kaanum Pongalyear (latent)", -5.594711379601839),
-                                    ("Maha Saptamiyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Thursdayat <time-of-day>", -5.604575824572753),
+                                    ("Islamic New Yearyear (latent)", -5.604575824572753),
+                                    ("Laylat al-Qadryear (latent)", -5.093750200806762),
+                                    ("Chhathin <named-month>|year", -6.010040932680917),
+                                    ("Vasant Panchamiin <named-month>|year", -6.010040932680917),
+                                    ("Diwaliin <named-month>|year", -6.010040932680917),
+                                    ("Shrove Tuesdayyear (latent)", -6.010040932680917),
+                                    ("<time-of-day> am|pmtomorrow", -5.316893752120972),
+                                    ("Yom Kippuryear (latent)", -6.010040932680917),
+                                    ("<part-of-day> of <time>year (latent)", -6.010040932680917),
+                                    ("minutehour", -5.093750200806762),
+                                    ("Kaanum Pongalyear (latent)", -5.604575824572753),
+                                    ("Maha Saptamiyear (latent)", -6.010040932680917),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.295428395471578),
-                                    ("for <duration> from <time>December", -6.000176487710004),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.000176487710004),
+                                     -4.305292840442492),
+                                    ("for <duration> from <time>December", -6.010040932680917),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.010040932680917),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.083885755835849),
+                                     -5.093750200806762),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.594711379601839),
-                                    ("Pentecostyear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Pentecostyear (latent)", -6.010040932680917),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.083885755835849),
-                                    ("Eid al-Fitryear (latent)", -6.000176487710004),
-                                    ("Mondayin|during the <part-of-day>", -6.000176487710004),
-                                    ("Raksha Bandhanyear (latent)", -6.000176487710004),
+                                     -5.093750200806762),
+                                    ("Eid al-Fitryear (latent)", -6.010040932680917),
+                                    ("Mondayin|during the <part-of-day>", -6.010040932680917),
+                                    ("Raksha Bandhanyear (latent)", -6.010040932680917),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.594711379601839),
-                                    ("Navaratriin <named-month>|year", -6.000176487710004),
-                                    ("Ashurayear (latent)", -6.000176487710004),
-                                    ("Chinese New Yearyear (latent)", -6.000176487710004),
-                                    ("Sundayyear (latent)", -6.000176487710004),
-                                    ("Lag BaOmeryear (latent)", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Navaratriin <named-month>|year", -6.010040932680917),
+                                    ("Ashurayear (latent)", -6.010040932680917),
+                                    ("Chinese New Yearyear (latent)", -6.010040932680917),
+                                    ("Sundayyear (latent)", -6.010040932680917),
+                                    ("Lag BaOmeryear (latent)", -6.010040932680917),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Eid al-Adhayear (latent)", -5.083885755835849),
-                                    ("intersectin|during the <part-of-day>", -6.000176487710004),
-                                    ("Christmasat <time-of-day>", -6.000176487710004),
-                                    ("Passoveryear (latent)", -6.000176487710004),
-                                    ("Lazarus Saturdayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Eid al-Adhayear (latent)", -5.093750200806762),
+                                    ("intersectin|during the <part-of-day>", -6.010040932680917),
+                                    ("Christmasat <time-of-day>", -6.010040932680917),
+                                    ("Passoveryear (latent)", -6.010040932680917),
+                                    ("Lazarus Saturdayyear (latent)", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.000176487710004),
-                                    ("Yom HaShoahyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Yom HaShoahyear (latent)", -5.604575824572753),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Thai Pongalin <named-month>|year", -6.000176487710004),
-                                    ("Septemberyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Thai Pongalin <named-month>|year", -6.010040932680917),
+                                    ("Septemberyear (latent)", -5.604575824572753),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.747413519214636),
-                                    ("Halloweenyear (latent)", -6.000176487710004),
+                                     -4.757277964185549),
+                                    ("Halloweenyear (latent)", -6.010040932680917),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.307029307150058),
+                                     -5.316893752120972),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.083885755835849),
-                                    ("at <time-of-day>intersect", -5.594711379601839),
-                                    ("Rosh Hashanahyear (latent)", -6.000176487710004),
-                                    ("Dhanterasyear (latent)", -6.000176487710004),
-                                    ("Tu BiShvatyear (latent)", -6.000176487710004),
-                                    ("Holiyear (latent)", -5.307029307150058),
+                                     -5.093750200806762),
+                                    ("at <time-of-day>intersect", -5.604575824572753),
+                                    ("Rosh Hashanahyear (latent)", -5.316893752120972),
+                                    ("Dhanterasyear (latent)", -6.010040932680917),
+                                    ("Tu BiShvatyear (latent)", -6.010040932680917),
+                                    ("Holiyear (latent)", -5.316893752120972),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Holika Dahanyear (latent)", -5.307029307150058),
+                                     -6.010040932680917),
+                                    ("Holika Dahanyear (latent)", -5.316893752120972),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("dayminute", -3.435227130248467),
-                                    ("Mawlidyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("dayminute", -3.4450915752193807),
+                                    ("Mawlidyear (latent)", -6.010040932680917),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.594711379601839),
+                                     -5.604575824572753),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.000176487710004),
-                                    ("Jumu'atul-Widayear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Jumu'atul-Widayear (latent)", -5.093750200806762),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.000176487710004),
-                                    ("minuteday", -2.362590327983618),
+                                     -6.010040932680917),
+                                    ("minuteday", -2.3724547729545318),
                                     ("absorption of , after named dayintersect",
-                                     -6.000176487710004),
-                                    ("intersectyear (latent)", -6.000176487710004),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("intersectyear (latent)", -6.010040932680917),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.010040932680917),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Boss's Dayyear (latent)", -5.594711379601839),
-                                    ("Global Youth Service Dayyear (latent)", -6.000176487710004),
-                                    ("Tisha B'Avyear (latent)", -6.000176487710004),
-                                    ("Isra and Mi'rajyear (latent)", -5.083885755835849),
+                                     -6.010040932680917),
+                                    ("Boss's Dayyear (latent)", -5.604575824572753),
+                                    ("Global Youth Service Dayyear (latent)", -6.010040932680917),
+                                    ("Tisha B'Avyear (latent)", -6.010040932680917),
+                                    ("Isra and Mi'rajyear (latent)", -5.093750200806762),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.000176487710004),
-                                    ("Christmasyear (latent)", -5.594711379601839),
-                                    ("Naraka Chaturdashiyear (latent)", -5.594711379601839),
-                                    ("at <time-of-day>on <date>", -4.901564199041894),
+                                     -6.010040932680917),
+                                    ("Christmasyear (latent)", -5.604575824572753),
+                                    ("Naraka Chaturdashiyear (latent)", -5.604575824572753),
+                                    ("at <time-of-day>on <date>", -4.911428644012807),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.390738575275903),
-                                    ("dayweek", -6.000176487710004),
-                                    ("Easter Sundayyear (latent)", -5.307029307150058),
-                                    ("weekyear", -4.901564199041894),
-                                    ("hh:mmin|during the <part-of-day>", -5.307029307150058),
+                                     -4.400603020246817),
+                                    ("dayweek", -6.010040932680917),
+                                    ("Easter Sundayyear (latent)", -5.316893752120972),
+                                    ("weekyear", -4.911428644012807),
+                                    ("hh:mmin|during the <part-of-day>", -5.316893752120972),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.594711379601839),
-                                    ("Hanukkahyear (latent)", -6.000176487710004),
-                                    ("February<time> <part-of-day>", -6.000176487710004),
-                                    ("Tuesdayin <named-month>|year", -6.000176487710004),
-                                    ("Great Lentyear (latent)", -6.000176487710004),
-                                    ("tomorrowat <time-of-day>", -5.307029307150058),
-                                    ("between <time> and <time>on <date>", -4.390738575275903),
-                                    ("last <cycle> of <time>year (latent)", -5.307029307150058),
-                                    ("at <time-of-day>tomorrow", -5.594711379601839),
-                                    ("tomorrow<time-of-day> am|pm", -6.000176487710004),
+                                     -5.604575824572753),
+                                    ("Hanukkahyear (latent)", -5.316893752120972),
+                                    ("February<time> <part-of-day>", -6.010040932680917),
+                                    ("Tuesdayin <named-month>|year", -6.010040932680917),
+                                    ("Great Lentyear (latent)", -6.010040932680917),
+                                    ("tomorrowat <time-of-day>", -5.316893752120972),
+                                    ("between <time> and <time>on <date>", -4.400603020246817),
+                                    ("last <cycle> of <time>year (latent)", -5.316893752120972),
+                                    ("at <time-of-day>tomorrow", -5.604575824572753),
+                                    ("tomorrow<time-of-day> am|pm", -6.010040932680917),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.000176487710004),
-                                    ("Diwaliyear (latent)", -6.000176487710004),
-                                    ("Black Fridayyear (latent)", -5.594711379601839),
+                                     -6.010040932680917),
+                                    ("Diwaliyear (latent)", -6.010040932680917),
+                                    ("Black Fridayyear (latent)", -5.604575824572753),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.000176487710004),
+                                     -6.010040932680917),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.000176487710004),
-                                    ("Chhathyear (latent)", -5.594711379601839),
-                                    ("Vasant Panchamiyear (latent)", -6.000176487710004),
-                                    ("Palm Sundayintersect", -6.000176487710004),
+                                     -6.010040932680917),
+                                    ("Chhathyear (latent)", -5.604575824572753),
+                                    ("Vasant Panchamiyear (latent)", -6.010040932680917),
+                                    ("Palm Sundayintersect", -6.010040932680917),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.000176487710004),
-                                    ("Februaryintersect", -6.000176487710004),
-                                    ("Simchat Torahyear (latent)", -6.000176487710004),
-                                    ("minuteyear", -6.000176487710004)],
-                               n = 300},
+                                     -6.010040932680917),
+                                    ("Februaryintersect", -6.010040932680917),
+                                    ("Simchat Torahyear (latent)", -6.010040932680917),
+                                    ("minuteyear", -6.010040932680917)],
+                               n = 304},
                    koData =
-                     ClassData{prior = -0.967149149107646, unseen = -6.3561076606958915,
+                     ClassData{prior = -0.9753796482441617,
+                               unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
@@ -1320,14 +1320,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.16290347093685306, unseen = -4.90527477843843,
+                     ClassData{prior = -0.15840600539739666,
+                               unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.580953603129422e-2),
-                                    ("intersect 2 numbers", -3.5115454388310208)],
-                               n = 130},
+                                   [("integer (numeric)", -4.445176257083381e-2),
+                                    ("intersect 2 numbers", -3.5409593240373143)],
+                               n = 134},
                    koData =
-                     ClassData{prior = -1.8949437054632858, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -1.0986122886681098),
@@ -1377,8 +1378,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Hanukkah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2044,8 +2045,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("Rosh Hashanah",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Time/EN/Corpus.hs b/Duckling/Time/EN/Corpus.hs
index 2cd1e0ca..ea5052ae 100644
--- a/Duckling/Time/EN/Corpus.hs
+++ b/Duckling/Time/EN/Corpus.hs
@@ -1292,9 +1292,13 @@ allExamples = concat
              ]
   , examples (datetimeIntervalHoliday ((2018, 9, 9, 0, 0, 0), (2018, 9, 12, 0, 0, 0)) Day "Rosh Hashanah")
              [ "rosh hashanah 2018"
+             , "rosh hashana 2018"
+             , "rosh hashanna 2018"
              ]
   , examples (datetimeIntervalHoliday ((2018, 12, 2, 0, 0, 0), (2018, 12, 10, 0, 0, 0)) Day "Hanukkah")
              [ "Chanukah 2018"
+             , "hanukah 2018"
+             , "hannukkah 2018"
              ]
   , examples (datetimeIntervalHoliday ((2018, 3, 30, 0, 0, 0), (2018, 4, 8, 0, 0, 0)) Day "Passover")
              [ "passover 2018"
diff --git a/Duckling/Time/EN/Rules.hs b/Duckling/Time/EN/Rules.hs
index 746d043a..3358d1f6 100644
--- a/Duckling/Time/EN/Rules.hs
+++ b/Duckling/Time/EN/Rules.hs
@@ -1704,7 +1704,7 @@ ruleComputedHolidays' = mkRuleHolidays'
     , let start = cycleNthAfter False TG.Day (-48) orthodoxEaster
           end = cycleNthAfter False TG.Day (-9) orthodoxEaster
         in interval TTime.Open start end )
-  , ( "Hanukkah", "c?hanukk?ah"
+  , ( "Hanukkah", "c?hann?ukk?ah"
     , let start = chanukah
           end = cycleNthAfter False TG.Day 7 chanukah
         in interval TTime.Open start end )
@@ -1724,7 +1724,7 @@ ruleComputedHolidays' = mkRuleHolidays'
     , let start = ramadan
           end = cycleNthAfter False TG.Day (-1) eidalFitr
         in interval TTime.Open start end )
-  , ( "Rosh Hashanah", "rosh hashanah|yom teruah"
+  , ( "Rosh Hashanah", "rosh hashann?ah?|yom teruah"
     , let start = roshHashana
           end = cycleNthAfter False TG.Day 2 roshHashana
         in interval TTime.Open start end )