From e1641aeba402aa59495b449b0cb72bcc55b002c2 Mon Sep 17 00:00:00 2001
From: Lautaro Emanuel <emlautarom1@gmail.com>
Date: Wed, 10 Nov 2021 10:26:21 -0800
Subject: [PATCH 1/9] Added missing 'TR' time test cases (#661)

Summary:
Fixes https://github.com/facebook/duckling/issues/660.

Pull Request resolved: https://github.com/facebook/duckling/pull/661

Test Plan: :test Duckling.Time.TR.Tests

Reviewed By: stroxler

Differential Revision: D32145794

Pulled By: chessai

fbshipit-source-id: 4d55043f133b8238e9e8360264a3fbea6af2d022
---
 Duckling/Ranking/Classifiers/TR_XX.hs | 1228 ++++++++++++++++++++++++-
 Duckling/Time/TR/Corpus.hs            |   14 +-
 Duckling/Time/TR/Rules.hs             |   85 +-
 duckling.cabal                        |    1 +
 exe/Duckling/Ranking/Generate.hs      |    3 +-
 tests/Duckling/Time/Tests.hs          |    2 +
 6 files changed, 1272 insertions(+), 61 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/TR_XX.hs b/Duckling/Ranking/Classifiers/TR_XX.hs
index d31da2698..433cf07e4 100644
--- a/Duckling/Ranking/Classifiers/TR_XX.hs
+++ b/Duckling/Ranking/Classifiers/TR_XX.hs
@@ -19,4 +19,1230 @@ import qualified Data.HashMap.Strict as HashMap
 import Duckling.Ranking.Types
 
 classifiers :: Classifiers
-classifiers = HashMap.fromList []
\ No newline at end of file
+classifiers
+  = HashMap.fromList
+      [("week",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("integer (numeric)",
+        Classifier{okData =
+                     ClassData{prior = -0.4302451371066514, unseen = -4.553876891600541,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 93},
+                   koData =
+                     ClassData{prior = -1.0508216248317612, unseen = -3.951243718581427,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 50}}),
+       ("Sal\305",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("lunch",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Ramazan Bayram\305",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<time> <part-of-day>",
+        Classifier{okData =
+                     ClassData{prior = -0.10536051565782628,
+                               unseen = -3.4011973816621555,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("dayhour", -1.0647107369924282),
+                                    ("tomorrowevening", -2.6741486494265287),
+                                    ("<day-of-month> (non ordinal) <named-month>part of days",
+                                     -2.6741486494265287),
+                                    ("Pazartesipart of days", -2.6741486494265287),
+                                    ("Cumartesipart of days", -2.6741486494265287),
+                                    ("tomorrowlunch", -2.6741486494265287),
+                                    ("tomorrowpart of days", -2.268683541318364),
+                                    ("yesterdayevening", -2.6741486494265287),
+                                    ("yesterdaypart of days", -2.6741486494265287)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -2.3025850929940455, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("\350ubatpart of days", -1.8718021769015913),
+                                    ("monthhour", -1.8718021769015913)],
+                               n = 1}}),
+       ("today",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("at <time-of-day>",
+        Classifier{okData =
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -4.060443010546419,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("time-of-day (latent)", -1.4039939382192916),
+                                    ("hh:mm", -1.55814461804655),
+                                    ("about|exactly <time-of-day>", -2.9444389791664407),
+                                    ("hour", -1.4039939382192916), ("minute", -1.4039939382192916)],
+                               n = 26},
+                   koData =
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -3.4657359027997265,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("time-of-day (latent)", -0.8690378470236094),
+                                    ("about|exactly <time-of-day>", -2.740840023925201),
+                                    ("hour", -0.7949298748698876)],
+                               n = 13}}),
+       ("the ides of <named-month>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("Mart", -1.252762968495368), ("month", -0.8472978603872037),
+                                    ("\350ubat", -1.252762968495368)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("g\252n (grain)",
+        Classifier{okData =
+                     ClassData{prior = -0.3101549283038396,
+                               unseen = -2.5649493574615367,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 11},
+                   koData =
+                     ClassData{prior = -1.3217558399823195, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+       ("Ekim",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("yaz",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<integer> + '\"",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
+                               n = 1}}),
+       ("Cuma",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<ordinal> quarter",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarter", -0.6931471805599453),
+                                    ("ordinals (first..31st)\231eyrek y\305l (grain)",
+                                     -0.6931471805599453)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Emek ve Dayan\305\351ma G\252n\252",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("intersect",
+        Classifier{okData =
+                     ClassData{prior = -0.5049259016388025, unseen = -5.673323267171493,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("<named-month> <day-of-month> (non ordinal)Cuma",
+                                     -4.976733742420574),
+                                    ("Cuma<named-month> <day-of-month> (non ordinal)",
+                                     -4.976733742420574),
+                                    ("Cumartesiat <time-of-day>", -4.57126863431241),
+                                    ("dayhour", -3.590439381300684),
+                                    ("<day-of-month> (non ordinal) <named-month>Cuma",
+                                     -4.57126863431241),
+                                    ("monthday", -3.367295829986474),
+                                    ("monthyear", -4.57126863431241),
+                                    ("yearhour", -4.976733742420574),
+                                    ("intersectCuma", -3.7239707739252066),
+                                    ("Ekimintersect", -3.8781214537524646),
+                                    ("Per\351embe<datetime> - <datetime> (interval)",
+                                     -4.976733742420574),
+                                    ("Per\351embe<time-of-day> - <time-of-day> (interval)",
+                                     -4.283586561860629),
+                                    ("year<day-of-month> (ordinal)", -4.976733742420574),
+                                    ("intersectat <time-of-day>", -3.8781214537524646),
+                                    ("yearintersect", -4.57126863431241),
+                                    ("next <cycle>at <time-of-day>", -4.976733742420574),
+                                    ("intersectSal\305", -4.57126863431241),
+                                    ("Cumaat <time-of-day>", -4.57126863431241),
+                                    ("<day-of-month> (non ordinal) <named-month>Cumartesi",
+                                     -4.976733742420574),
+                                    ("<named-month> <day-of-month> (non ordinal)Pazartesi",
+                                     -4.976733742420574),
+                                    ("Cumartesi<part-of-day> of <time>", -4.976733742420574),
+                                    ("<day-of-month> (non ordinal) <named-month>Pazartesi",
+                                     -4.976733742420574),
+                                    ("yearKurban Bayram\305", -4.060443010546419),
+                                    ("dayday", -2.578838469622204),
+                                    ("<time> <part-of-day>at <time-of-day>", -4.976733742420574),
+                                    ("last <cycle>Pazar", -4.976733742420574),
+                                    ("hourhour", -4.976733742420574),
+                                    ("yearRamazan Bayram\305", -3.590439381300684),
+                                    ("dayyear", -3.367295829986474),
+                                    ("<day-of-month> (non ordinal) <named-month>intersect",
+                                     -3.7239707739252066),
+                                    ("EOM|End of dayat <time-of-day>", -4.976733742420574),
+                                    ("<day-of-month> (non ordinal) <named-month>Sal\305",
+                                     -4.976733742420574),
+                                    ("<day-of-month> (ordinal)\199ar\351amba", -4.976733742420574),
+                                    ("before yesterdayat <time-of-day>", -4.976733742420574),
+                                    ("Pazar<day-of-month> (non ordinal) <named-month>",
+                                     -4.976733742420574),
+                                    ("Y\305lba\351\305at <time-of-day>", -4.976733742420574),
+                                    ("at <time-of-day><day-of-month> (non ordinal) <named-month>",
+                                     -4.976733742420574),
+                                    ("hh:mm<day-of-month> (non ordinal) <named-month>",
+                                     -4.976733742420574),
+                                    ("hh:mmintersect", -4.283586561860629),
+                                    ("Ekim<day-of-month> (ordinal)", -4.57126863431241),
+                                    ("at <time-of-day>intersect", -4.283586561860629),
+                                    ("dayminute", -2.7254419438140793),
+                                    ("intersectyear", -4.57126863431241),
+                                    ("minuteday", -2.9618307218783095),
+                                    ("yearCuma", -4.57126863431241),
+                                    ("Ekimyear", -4.57126863431241),
+                                    ("<day-of-month> (ordinal)Sal\305", -4.57126863431241),
+                                    ("intersect<day-of-month> (ordinal)", -4.976733742420574),
+                                    ("intersectintersect", -4.060443010546419),
+                                    ("weekday", -4.57126863431241),
+                                    ("yearday", -2.8972922007407385),
+                                    ("Ramazan Bayram\305year", -4.976733742420574),
+                                    ("next <cycle>\199ar\351amba", -4.976733742420574),
+                                    ("tomorrowat <time-of-day>", -4.976733742420574),
+                                    ("<duration> henceat <time-of-day>", -4.976733742420574),
+                                    ("Per\351embehh:mm", -4.976733742420574),
+                                    ("intersect\199ar\351amba", -4.283586561860629),
+                                    ("<named-month> <day-of-month> (non ordinal)year",
+                                     -4.283586561860629),
+                                    ("minuteyear", -4.57126863431241),
+                                    ("<day-of-month> (non ordinal) <named-month>year",
+                                     -3.8781214537524646),
+                                    ("yearminute", -4.976733742420574)],
+                               n = 102},
+                   koData =
+                     ClassData{prior = -0.9252060955321073,
+                               unseen = -5.3981627015177525,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("Cumartesiat <time-of-day>", -4.700480365792417),
+                                    ("dayhour", -2.2155737160044158),
+                                    ("daymonth", -4.700480365792417),
+                                    ("monthday", -2.995732273553991),
+                                    ("monthyear", -3.6018680771243066),
+                                    ("yearhour", -4.700480365792417),
+                                    ("intersectCuma", -4.295015257684252),
+                                    ("Per\351embe<datetime> - <datetime> (interval)",
+                                     -4.295015257684252),
+                                    ("Cumaintersect", -4.700480365792417),
+                                    ("intersectat <time-of-day>", -2.754570216737103),
+                                    ("yearintersect", -4.700480365792417),
+                                    ("<day-of-month> (ordinal)year", -4.700480365792417),
+                                    ("Cumaat <time-of-day>", -4.295015257684252),
+                                    ("Martyear", -4.295015257684252),
+                                    ("monthhour", -3.6018680771243066),
+                                    ("<day-of-month> (ordinal)<day-of-month> (ordinal)",
+                                     -4.700480365792417),
+                                    ("dayday", -3.6018680771243066),
+                                    ("\350ubatPazartesi", -4.700480365792417),
+                                    ("<day-of-month> (ordinal)intersect", -4.700480365792417),
+                                    ("Temmuz<day-of-month> (ordinal)", -4.700480365792417),
+                                    ("dayyear", -4.295015257684252),
+                                    ("<day-of-month> (non ordinal) <named-month>intersect",
+                                     -3.784189633918261),
+                                    ("EOM|End of dayat <time-of-day>", -4.700480365792417),
+                                    ("monthminute", -3.6018680771243066),
+                                    ("Per\351embe<day-of-month> (ordinal)", -4.700480365792417),
+                                    ("Temmuzyear", -4.295015257684252),
+                                    ("Nisanyear", -4.700480365792417),
+                                    ("CumaTemmuz", -4.700480365792417),
+                                    ("TemmuzCuma", -4.700480365792417),
+                                    ("last <cycle>at <time-of-day>", -4.700480365792417),
+                                    ("\350ubatSal\305", -4.700480365792417),
+                                    ("<day-of-month> (ordinal)hh:mm", -4.007333185232471),
+                                    ("dayminute", -3.196402969016142),
+                                    ("intersectyear", -4.700480365792417),
+                                    ("Eyl\252lCuma", -4.700480365792417),
+                                    ("minuteday", -4.295015257684252),
+                                    ("Eyl\252lintersect", -3.784189633918261),
+                                    ("intersect<day-of-month> (ordinal)", -4.700480365792417),
+                                    ("intersectintersect", -4.007333185232471),
+                                    ("Temmuzintersect", -3.4477173972970485),
+                                    ("Eyl\252lCumartesi", -4.700480365792417),
+                                    ("Per\351embeat <time-of-day>", -4.700480365792417),
+                                    ("tomorrowat <time-of-day>", -4.700480365792417),
+                                    ("<datetime> - <datetime> (interval)<day-of-month> (ordinal)",
+                                     -4.295015257684252),
+                                    ("tomorrownoon", -4.700480365792417)],
+                               n = 67}}),
+       ("y\305l (grain)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("after tomorrow",
+        Classifier{okData =
+                     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}}),
+       ("next <cycle>",
+        Classifier{okData =
+                     ClassData{prior = -0.1431008436406733,
+                               unseen = -3.6109179126442243,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -1.791759469228055),
+                                    ("g\252n (grain)", -2.890371757896165),
+                                    ("y\305l (grain)", -2.890371757896165),
+                                    ("hafta (grain)", -1.791759469228055),
+                                    ("day", -2.890371757896165), ("quarter", -2.890371757896165),
+                                    ("year", -2.890371757896165),
+                                    ("\231eyrek y\305l (grain)", -2.890371757896165),
+                                    ("ay (grain)", -1.791759469228055),
+                                    ("month", -1.791759469228055)],
+                               n = 13},
+                   koData =
+                     ClassData{prior = -2.0149030205422647, unseen = -2.70805020110221,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("g\252n (grain)", -1.540445040947149),
+                                    ("day", -1.540445040947149)],
+                               n = 2}}),
+       ("yyyy-mm-dd",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("year (latent)",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
+                               n = 1}}),
+       ("mm/dd/yyyy",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("yesterday",
+        Classifier{okData =
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+       ("hafta (grain)",
+        Classifier{okData =
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.258096538021482,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 24},
+                   koData =
+                     ClassData{prior = -2.5649493574615367,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+       ("Pazartesi",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Nisan",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("intersectordinals (first..31st)\199ar\351amba",
+                                     -2.1972245773362196),
+                                    ("<day-of-month> (ordinal)ordinal (digits)year",
+                                     -2.1972245773362196),
+                                    ("monthday", -1.5040773967762742),
+                                    ("dayyear", -2.1972245773362196),
+                                    ("Ekimordinals (first..31st)Sal\305", -1.791759469228055)],
+                               n = 4},
+                   koData =
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.9444389791664407,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("<day-of-month> (ordinal)ordinal (digits)time-of-day (latent)",
+                                     -1.791759469228055),
+                                    ("dayhour", -1.791759469228055),
+                                    ("dayyear", -2.1972245773362196),
+                                    ("yearordinals (first..31st)\199ar\351amba",
+                                     -2.1972245773362196),
+                                    ("Per\351embeordinal (digits)year (latent)",
+                                     -2.1972245773362196),
+                                    ("yearday", -2.1972245773362196)],
+                               n = 4}}),
+       ("saniye (grain)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Cumartesi",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("ordinals (first..31st)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Temmuz",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<part-of-day> of <time>",
+        Classifier{okData =
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.5649493574615367,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hourhour", -1.3862943611198906),
+                                    ("hourminute", -1.3862943611198906),
+                                    ("part of daysat <time-of-day>", -1.0986122886681098),
+                                    ("eveningat <time-of-day>", -1.791759469228055)],
+                               n = 4},
+                   koData =
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hourhour", -0.9808292530117262),
+                                    ("part of daysat <time-of-day>", -1.3862943611198906),
+                                    ("eveningat <time-of-day>", -1.3862943611198906)],
+                               n = 2}}),
+       ("EOY|End of year",
+        Classifier{okData =
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -0.2231435513142097, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+       ("now",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("this <part-of-day>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hour", -0.8472978603872037), ("evening", -1.252762968495368),
+                                    ("part of days", -1.252762968495368)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<duration> hence",
+        Classifier{okData =
+                     ClassData{prior = -0.2411620568168881,
+                               unseen = -3.4011973816621555,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -1.575536360758419), ("day", -1.9810014688665833),
+                                    ("year", -2.268683541318364),
+                                    ("<integer> <unit-of-duration>", -0.8823891801984737),
+                                    ("month", -2.6741486494265287)],
+                               n = 11},
+                   koData =
+                     ClassData{prior = -1.540445040947149, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("day", -1.8718021769015913), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -1.466337068793427),
+                                    ("fortnight", -1.8718021769015913),
+                                    ("minute", -1.8718021769015913)],
+                               n = 3}}),
+       ("numbers prefix with -, negative or minus",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
+                               likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
+                               n = 11}}),
+       ("tomorrow",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Zafer Bayram\305",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Per\351embe",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("by <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("day", -1.3862943611198906),
+                                    ("EOM|End of month", -1.3862943611198906),
+                                    ("month", -1.3862943611198906),
+                                    ("EOM|End of day", -1.3862943611198906)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("fractional number",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+       ("<duration> from now",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -2.70805020110221,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("second", -1.540445040947149), ("year", -1.9459101490553135),
+                                    ("<integer> <unit-of-duration>", -0.8472978603872037),
+                                    ("hour", -1.540445040947149)],
+                               n = 5}}),
+       ("quarter",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+       ("this <cycle>",
+        Classifier{okData =
+                     ClassData{prior = -0.2876820724517809,
+                               unseen = -2.5649493574615367,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -1.791759469228055),
+                                    ("y\305l (grain)", -1.791759469228055),
+                                    ("hafta (grain)", -1.791759469228055),
+                                    ("quarter", -1.791759469228055), ("year", -1.791759469228055),
+                                    ("\231eyrek y\305l (grain)", -1.791759469228055)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -1.3862943611198906,
+                               unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -1.3862943611198906),
+                                    ("hafta (grain)", -1.3862943611198906)],
+                               n = 1}}),
+       ("dakika (grain)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("time-of-day (latent)",
+        Classifier{okData =
+                     ClassData{prior = -0.6061358035703156, unseen = -3.044522437723423,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer (numeric)", -0.10536051565782628),
+                                    ("integer (0..9)", -2.3025850929940455)],
+                               n = 18},
+                   koData =
+                     ClassData{prior = -0.7884573603642702, unseen = -2.890371757896165,
+                               likelihoods =
+                                 HashMap.fromList [("integer (numeric)", -6.0624621816434854e-2)],
+                               n = 15}}),
+       ("A\287ustos",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("year",
+        Classifier{okData =
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -3.258096538021482,
+                               likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
+                               n = 24},
+                   koData =
+                     ClassData{prior = -2.5649493574615367,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
+                               n = 2}}),
+       ("<integer> <unit-of-duration>",
+        Classifier{okData =
+                     ClassData{prior = -0.43995128417933377,
+                               unseen = -4.584967478670572,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.0898043287153825),
+                                    ("integer (numeric)hafta (grain)", -2.782951509275328),
+                                    ("integer (numeric)saniye (grain)", -3.4760986898352733),
+                                    ("integer (0..9)saniye (grain)", -3.4760986898352733),
+                                    ("second", -2.9652730660692823),
+                                    ("integer (numeric)g\252n (grain)", -2.495269436823547),
+                                    ("integer (0..9)g\252n (grain)", -3.8815637979434374),
+                                    ("integer (numeric)y\305l (grain)", -3.8815637979434374),
+                                    ("day", -2.3774864011671633),
+                                    ("integer (0..9)ay (grain)", -3.4760986898352733),
+                                    ("year", -2.782951509275328),
+                                    ("integer (0..9)y\305l (grain)", -2.9652730660692823),
+                                    ("hour", -3.8815637979434374), ("month", -3.4760986898352733),
+                                    ("integer (numeric)dakika (grain)", -2.782951509275328),
+                                    ("integer (0..9)saat (grain)", -3.8815637979434374),
+                                    ("integer (0..9)hafta (grain)", -2.62880082944807),
+                                    ("minute", -2.495269436823547),
+                                    ("integer (0..9)dakika (grain)", -3.4760986898352733)],
+                               n = 38},
+                   koData =
+                     ClassData{prior = -1.0330150061822965,
+                               unseen = -4.1588830833596715,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.7568403652716422),
+                                    ("integer (numeric)saniye (grain)", -3.044522437723423),
+                                    ("integer (0..9)saniye (grain)", -3.044522437723423),
+                                    ("second", -2.5336968139574325),
+                                    ("integer (numeric)g\252n (grain)", -3.4499875458315876),
+                                    ("integer (numeric)ay (grain)", -3.4499875458315876),
+                                    ("integer (0..9)g\252n (grain)", -3.4499875458315876),
+                                    ("integer (numeric)y\305l (grain)", -3.044522437723423),
+                                    ("day", -3.044522437723423),
+                                    ("integer (0..9)ay (grain)", -3.4499875458315876),
+                                    ("year", -2.5336968139574325),
+                                    ("integer (0..9)y\305l (grain)", -3.044522437723423),
+                                    ("hour", -2.5336968139574325), ("month", -3.044522437723423),
+                                    ("integer (numeric)dakika (grain)", -3.4499875458315876),
+                                    ("integer (0..9)saat (grain)", -3.044522437723423),
+                                    ("integer (0..9)hafta (grain)", -2.7568403652716422),
+                                    ("minute", -3.044522437723423),
+                                    ("integer (numeric)saat (grain)", -3.044522437723423),
+                                    ("integer (0..9)dakika (grain)", -3.4499875458315876)],
+                               n = 21}}),
+       ("Aral\305k",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("\199ar\351amba",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<duration> after <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("dayyear", -1.2039728043259361),
+                                    ("hourminute", -1.6094379124341003),
+                                    ("at <time-of-day><integer> <unit-of-duration>",
+                                     -1.6094379124341003),
+                                    ("Y\305lba\351\305<integer> <unit-of-duration>",
+                                     -1.2039728043259361)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("integer (10..90)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Kurban Bayram\305",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("\231eyrek y\305l (grain)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("hh:mm",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("ay (grain)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Mart",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("about|exactly <time-of-day>",
+        Classifier{okData =
+                     ClassData{prior = -0.4700036292457356, unseen = -2.890371757896165,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("at <time-of-day>", -1.7346010553881064),
+                                    ("hh:mm", -1.4469189829363254), ("minute", -1.041453874828161)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -0.9808292530117262, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("at <time-of-day>", -1.8718021769015913),
+                                    ("day", -1.8718021769015913),
+                                    ("time-of-day (latent)", -1.8718021769015913),
+                                    ("<day-of-month> (ordinal)", -1.8718021769015913),
+                                    ("hour", -1.466337068793427)],
+                               n = 3}}),
+       ("k\305\351",
+        Classifier{okData =
+                     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}}),
+       ("<duration> ago",
+        Classifier{okData =
+                     ClassData{prior = -0.11778303565638351,
+                               unseen = -3.1354942159291497,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -1.4816045409242156), ("day", -1.9924301646902063),
+                                    ("year", -2.3978952727983707),
+                                    ("<integer> <unit-of-duration>", -0.8938178760220964),
+                                    ("month", -2.3978952727983707)],
+                               n = 8},
+                   koData =
+                     ClassData{prior = -2.1972245773362196,
+                               unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("day", -1.3862943611198906),
+                                    ("fortnight", -1.3862943611198906)],
+                               n = 1}}),
+       ("last <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.833213344056216,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("Sal\305", -2.0794415416798357), ("day", -1.1631508098056809),
+                                    ("k\305\351", -1.6739764335716716),
+                                    ("hour", -2.0794415416798357), ("Pazar", -2.0794415416798357),
+                                    ("week-end", -2.0794415416798357)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("EOM|End of month",
+        Classifier{okData =
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+       ("saat (grain)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<day-of-month> (ordinal)",
+        Classifier{okData =
+                     ClassData{prior = -2.6026896854443837,
+                               unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (first..31st)", -0.40546510810816444),
+                                    ("ordinal (digits)", -1.0986122886681098)],
+                               n = 4},
+                   koData =
+                     ClassData{prior = -7.696104113612832e-2,
+                               unseen = -3.970291913552122,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (first..31st)", -2.8526314299133175),
+                                    ("ordinal (digits)", -5.9423420470800764e-2)],
+                               n = 50}}),
+       ("Atat\252rk\8217\252 Anma, Gen\231lik ve Spor Bayram\305",
+        Classifier{okData =
+                     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}}),
+       ("noon",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+       ("evening",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("next <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -3.295836866004329,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("Sal\305", -1.466337068793427), ("Cuma", -2.5649493574615367),
+                                    ("day", -1.1786549963416462), ("Mart", -1.8718021769015913),
+                                    ("month", -1.8718021769015913),
+                                    ("ilkbahar", -2.5649493574615367)],
+                               n = 10},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Eyl\252l",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("last <cycle>",
+        Classifier{okData =
+                     ClassData{prior = -0.3184537311185346,
+                               unseen = -3.2188758248682006,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -1.5686159179138452),
+                                    ("y\305l (grain)", -2.4849066497880004),
+                                    ("hafta (grain)", -1.5686159179138452),
+                                    ("year", -2.4849066497880004),
+                                    ("ay (grain)", -1.791759469228055),
+                                    ("month", -1.791759469228055)],
+                               n = 8},
+                   koData =
+                     ClassData{prior = -1.2992829841302609, unseen = -2.70805020110221,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -1.9459101490553135),
+                                    ("g\252n (grain)", -1.540445040947149),
+                                    ("hafta (grain)", -1.9459101490553135),
+                                    ("day", -1.540445040947149)],
+                               n = 3}}),
+       ("Pazar",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Cumhuriyet Bayram\305",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("next n <cycle>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.5257286443082556),
+                                    ("integer (numeric)saniye (grain)", -2.5257286443082556),
+                                    ("integer (0..9)saniye (grain)", -2.5257286443082556),
+                                    ("second", -2.120263536200091),
+                                    ("integer (numeric)y\305l (grain)", -2.5257286443082556),
+                                    ("year", -2.120263536200091),
+                                    ("integer (0..9)y\305l (grain)", -2.5257286443082556),
+                                    ("hour", -2.120263536200091),
+                                    ("integer (0..9)saat (grain)", -2.5257286443082556),
+                                    ("integer (0..9)hafta (grain)", -2.5257286443082556),
+                                    ("integer (numeric)saat (grain)", -2.5257286443082556)],
+                               n = 7},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("in <duration>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -3.5553480614894135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.4277482359480516), ("second", -1.916922612182061),
+                                    ("day", -2.833213344056216),
+                                    ("<integer> <unit-of-duration>", -0.8183103235139514),
+                                    ("hour", -2.833213344056216), ("minute", -1.580450375560848)],
+                               n = 14},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<datetime> - <datetime> (interval)",
+        Classifier{okData =
+                     ClassData{prior = -1.252762968495368, unseen = -3.4339872044851463,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("intersecthh:mm", -2.70805020110221),
+                                    ("at <time-of-day>hh:mm", -2.70805020110221),
+                                    ("minuteminute", -1.6094379124341003),
+                                    ("hh:mmhh:mm", -2.0149030205422647),
+                                    ("dayday", -2.70805020110221),
+                                    ("<day-of-month> (non ordinal) <named-month><day-of-month> (non ordinal) <named-month>",
+                                     -2.70805020110221)],
+                               n = 6},
+                   koData =
+                     ClassData{prior = -0.3364722366212129, unseen = -3.891820298110627,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hourday", -2.4849066497880004),
+                                    ("monthday", -3.1780538303479458),
+                                    ("hh:mm<day-of-month> (ordinal)", -2.2617630984737906),
+                                    ("year<day-of-month> (ordinal)", -2.772588722239781),
+                                    ("dayday", -3.1780538303479458),
+                                    ("nth <time> of <time><day-of-month> (ordinal)",
+                                     -3.1780538303479458),
+                                    ("nth <time> of <time>hh:mm", -3.1780538303479458),
+                                    ("at <time-of-day><day-of-month> (ordinal)",
+                                     -2.2617630984737906),
+                                    ("dayminute", -3.1780538303479458),
+                                    ("minuteday", -1.791759469228055),
+                                    ("intersect<day-of-month> (ordinal)", -2.772588722239781),
+                                    ("yearday", -2.772588722239781),
+                                    ("A\287ustos<day-of-month> (non ordinal) <named-month>",
+                                     -3.1780538303479458)],
+                               n = 15}}),
+       ("fortnight",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+       ("\350ubat",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<time-of-day> - <time-of-day> (interval)",
+        Classifier{okData =
+                     ClassData{prior = -0.1823215567939546, unseen = -3.332204510175204,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hh:mmtime-of-day (latent)", -1.9095425048844386),
+                                    ("at <time-of-day>hh:mm", -2.6026896854443837),
+                                    ("minuteminute", -1.6863989535702288),
+                                    ("hh:mmhh:mm", -1.9095425048844386),
+                                    ("hourhour", -2.1972245773362196),
+                                    ("minutehour", -1.6863989535702288),
+                                    ("at <time-of-day>time-of-day (latent)", -1.9095425048844386)],
+                               n = 10},
+                   koData =
+                     ClassData{prior = -1.791759469228055, unseen = -2.4849066497880004,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hh:mmtime-of-day (latent)", -1.7047480922384253),
+                                    ("minutehour", -1.2992829841302609),
+                                    ("at <time-of-day>time-of-day (latent)", -1.7047480922384253)],
+                               n = 2}}),
+       ("last n <cycle>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -3.891820298110627,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -2.772588722239781),
+                                    ("integer (numeric)saniye (grain)", -3.1780538303479458),
+                                    ("integer (0..9)saniye (grain)", -3.1780538303479458),
+                                    ("second", -2.772588722239781),
+                                    ("integer (numeric)g\252n (grain)", -3.1780538303479458),
+                                    ("integer (numeric)ay (grain)", -3.1780538303479458),
+                                    ("integer (0..9)g\252n (grain)", -3.1780538303479458),
+                                    ("integer (numeric)y\305l (grain)", -3.1780538303479458),
+                                    ("day", -2.772588722239781),
+                                    ("integer (0..9)ay (grain)", -3.1780538303479458),
+                                    ("year", -2.772588722239781),
+                                    ("integer (0..9)y\305l (grain)", -3.1780538303479458),
+                                    ("hour", -2.772588722239781), ("month", -2.772588722239781),
+                                    ("integer (numeric)dakika (grain)", -3.1780538303479458),
+                                    ("integer (0..9)saat (grain)", -3.1780538303479458),
+                                    ("integer (0..9)hafta (grain)", -2.772588722239781),
+                                    ("minute", -2.772588722239781),
+                                    ("integer (numeric)saat (grain)", -3.1780538303479458),
+                                    ("integer (0..9)dakika (grain)", -3.1780538303479458)],
+                               n = 14},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -3.044522437723423,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<named-month> <day-of-month> (non ordinal)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -3.258096538021482,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("\350ubatinteger (numeric)", -2.5257286443082556),
+                                    ("A\287ustosinteger (numeric)", -2.120263536200091),
+                                    ("Martinteger (numeric)", -2.5257286443082556),
+                                    ("Martinteger (0..9)", -2.120263536200091),
+                                    ("Nisaninteger (numeric)", -2.5257286443082556),
+                                    ("Temmuzinteger (numeric)", -2.120263536200091),
+                                    ("month", -0.916290731874155)],
+                               n = 9},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("ilkbahar",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<day-of-month> (non ordinal) <named-month>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -3.784189633918261,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer (numeric)\350ubat", -2.151762203259462),
+                                    ("integer (numeric)Nisan", -3.068052935133617),
+                                    ("integer (numeric)A\287ustos", -2.662587827025453),
+                                    ("integer (numeric)Mart", -2.662587827025453),
+                                    ("integer (numeric)Eyl\252l", -2.662587827025453),
+                                    ("integer (0..9)Mart", -3.068052935133617),
+                                    ("integer (numeric)Temmuz", -2.374905754573672),
+                                    ("month", -0.8708283577973976),
+                                    ("integer (numeric)Aral\305k", -2.662587827025453)],
+                               n = 17},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("this|next <day-of-week>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.70805020110221,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("Sal\305", -1.252762968495368), ("Cuma", -1.9459101490553135),
+                                    ("Pazartesi", -1.9459101490553135),
+                                    ("day", -0.8472978603872037)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("ordinal (digits)",
+        Classifier{okData =
+                     ClassData{prior = -3.5115454388310208,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -3.0305349495328922e-2,
+                               unseen = -4.204692619390966,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 65}}),
+       ("integer (0..9)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -3.6109179126442243,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 35},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("week-end",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Y\305lba\351\305",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("integer 11..99",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods =
+                                 HashMap.fromList [("integer (10..90)integer (0..9)", 0.0)],
+                               n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("for <duration> from <time>",
+        Classifier{okData =
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("dayday", -0.9808292530117262),
+                                    ("<day-of-month> (non ordinal) <named-month><integer> <unit-of-duration>",
+                                     -0.9808292530117262)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("monthday", -0.9808292530117262),
+                                    ("Aral\305k<integer> <unit-of-duration>", -0.9808292530117262)],
+                               n = 2}}),
+       ("part of days",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Ulusal Egemenlik ve \199ocuk Bayram\305",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("<hour-of-day> <integer> (as relative minutes)",
+        Classifier{okData =
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("at <time-of-day>integer 11..99", -1.3862943611198906),
+                                    ("hour", -0.9808292530117262),
+                                    ("at <time-of-day>integer (numeric)", -1.3862943611198906)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("at <time-of-day>integer (10..90)", -1.0986122886681098),
+                                    ("hour", -1.0986122886681098)],
+                               n = 1}}),
+       ("EOM|End of day",
+        Classifier{okData =
+                     ClassData{prior = -1.7047480922384253,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -0.2006706954621511,
+                               unseen = -2.3978952727983707,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 9}}),
+       ("this <time>",
+        Classifier{okData =
+                     ClassData{prior = -0.2231435513142097, unseen = -2.772588722239781,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("yaz", -2.0149030205422647),
+                                    ("Pazartesi", -2.0149030205422647),
+                                    ("day", -1.3217558399823195),
+                                    ("k\305\351", -2.0149030205422647),
+                                    ("hour", -2.0149030205422647),
+                                    ("week-end", -2.0149030205422647)],
+                               n = 4},
+                   koData =
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -2.3025850929940455,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("Sal\305", -1.5040773967762742), ("day", -1.5040773967762742)],
+                               n = 1}}),
+       ("before yesterday",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}})]
\ No newline at end of file
diff --git a/Duckling/Time/TR/Corpus.hs b/Duckling/Time/TR/Corpus.hs
index 576670b14..3054beae0 100644
--- a/Duckling/Time/TR/Corpus.hs
+++ b/Duckling/Time/TR/Corpus.hs
@@ -294,7 +294,9 @@ allExamples = concat
              ]
   , examples (datetime (2013, 1, 29, 4, 0, 0) Hour)
              [ "14 gün önce"
-             , "iki hafta önce"
+             ]
+  , examples (datetime (2013, 1, 29, 0, 0, 0) Day)
+             [ "iki hafta önce"
              ]
   , examples (datetime (2013, 2, 5, 0, 0, 0) Day)
              [ "bir hafta önce"
@@ -314,7 +316,9 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 26, 4, 0, 0) Hour)
              [ "14 gün sonra"
-             , "iki hafta sonra"
+             ]
+  , examples (datetime (2013, 2, 26, 0, 0, 0) Day)
+             [ "iki hafta sonra"
              ]
   , examples (datetime (2013, 2, 19, 0, 0, 0) Day)
              [ "bir hafta sonra"
@@ -437,9 +441,11 @@ allExamples = concat
              [ "perşembe 9:30 - 11:00"
              ]
   , examples (datetimeInterval ((2013, 2, 12, 15, 0, 0), (2013, 2, 12, 17, 0, 0)) Hour)
-             [ "saat 15-16"]
+             [ "saat 15-16"
+             ]
   , examples (datetimeInterval ((2013, 2, 12, 15, 30, 0), (2013, 2, 12, 18, 1, 0)) Minute)
-             [ "saat 15:30 - 18"]
+             [ "saat 15:30 - 18"
+             ]
   , examples (datetimeInterval ((2013, 2, 14, 9, 0, 0), (2013, 2, 14, 12, 0, 0)) Hour)
              [ "perşembe saat 9-11"
              ]
diff --git a/Duckling/Time/TR/Rules.hs b/Duckling/Time/TR/Rules.hs
index d4aa2fa06..a3aec9b80 100644
--- a/Duckling/Time/TR/Rules.hs
+++ b/Duckling/Time/TR/Rules.hs
@@ -98,19 +98,21 @@ rulePartOfDays :: Rule
 rulePartOfDays = Rule
   { name = "part of days"
   , pattern =
-    [ regex "(sabahı?|öğlen?|akşam|gece|öğle\\syemeği)"
+    [ regex "(sabah(ı|a|tan)?|öğlen?|akşam|gece|öğle\\syemeği)"
     ]
   , prod = \case
       (Token RegexMatch (GroupMatch (match:_)):_) -> do
         let (start, end) = case Text.toLower match of
               "sabah"          -> (hour False 0, hour False 12 )
               "sabahı"         -> (hour False 0, hour False 12 )
+              "sabaha"         -> (hour False 0, hour False 12 )
+              "sabahtan"       -> (hour False 0, hour False 12 )
               "akşam"          -> (hour False 18, hour False 0 )
               "gece"           -> (hour False 18, hour False 0 )
               "öğlen"          -> (hour False 12, hour False 14)
               "öğle"           -> (hour False 12, hour False 14)
               "öğle yemeği"    -> (hour False 12, hour False 14)
-              _          -> (hour False 12, hour False 19)
+              _                -> (hour False 12, hour False 19)
         td <- interval TTime.Open start end
         tt $ partOfDay $ mkLatent td
       _ -> Nothing
@@ -233,7 +235,7 @@ ruleDurationFromNow = Rule
   { name = "<duration> from now"
   , pattern =
     [ regex "(bugünden\\s)?sonra(ki)?"
-    ,  dimension Duration
+    , dimension Duration
     ]
   , prod = \case
       (_:Token Duration dd:_) ->
@@ -269,19 +271,6 @@ ruleYearLatent2 = Rule
       _ -> Nothing
   }
 
-ruleTimeAfterNext :: Rule
-ruleTimeAfterNext = Rule
-  { name = "<time> after next"
-  , pattern =
-    [ regex "sonraki|önümüzdeki"
-    , dimension Time
-    ]
-  , prod = \case
-      (_:Token Time td:_) ->
-        tt $ predNth 1 True td
-      _ -> Nothing
-  }
-
 ruleNoon :: Rule
 ruleNoon = Rule
   { name = "noon"
@@ -456,8 +445,8 @@ ruleNthTimeAfterTime = Rule
       _ -> Nothing
   }
 
-ruleMmdd :: Rule
-ruleMmdd = Rule
+ruleMMDD :: Rule
+ruleMMDD = Rule
   { name = "mm/dd"
   , pattern =
     [ regex "([012]?[1-9]|10|20|30|31)\\.(10|11|12|0?[1-9])\\.?"
@@ -470,6 +459,21 @@ ruleMmdd = Rule
       _ -> Nothing
   }
 
+ruleMMDDYYYY :: Rule
+ruleMMDDYYYY = Rule
+  { name = "mm/dd/yyyy"
+  , pattern =
+    [ regex "(1[0-2]|0?[1-9])[-/\\s](3[01]|[12]\\d|0?[1-9])[-/\\s](\\d{2,4})"
+    ]
+  , prod = \case
+      (Token RegexMatch (GroupMatch (mm:dd:yy:_)):_) -> do
+        y <- parseInt yy
+        m <- parseInt mm
+        d <- parseInt dd
+        tt $ yearMonthDay y m d
+      _ -> Nothing
+  }
+
 ruleTimeofdayLatent :: Rule
 ruleTimeofdayLatent = Rule
   { name = "time-of-day (latent)"
@@ -669,8 +673,8 @@ ruleOrdinalQuarterYear = Rule
       _ -> Nothing
   }
 
-ruleYyyymmdd :: Rule
-ruleYyyymmdd = Rule
+ruleYYYYMMDD :: Rule
+ruleYYYYMMDD = Rule
   { name = "yyyy-mm-dd"
   , pattern =
     [ regex "(\\d{2,4})-(0?[1-9]|10|11|12)-([012]?[1-9]|10|20|30|31)"
@@ -699,19 +703,6 @@ ruleNextNCycle = Rule
       _ -> Nothing
   }
 
-ruleMorning :: Rule
-ruleMorning = Rule
-  { name = "morning"
-  , pattern =
-    [ regex "sabah(ı|a|tan)?"
-    ]
-  , prod = \_ ->
-      let from = hour False 3
-          to = hour False 12
-      in Token Time . mkLatent . partOfDay <$>
-           interval TTime.Open from to
-  }
-
 ruleThisPartofday :: Rule
 ruleThisPartofday = Rule
   { name = "this <part-of-day>"
@@ -736,6 +727,7 @@ ruleThisCycle = Rule
         tt $ cycleNth grain 0
       _ -> Nothing
   }
+
 ruleThisTime :: Rule
 ruleThisTime = Rule
   { name = "this <time>"
@@ -791,7 +783,7 @@ ruleAfterTimeofday = Rule
   { name = "after <time-of-day>"
   , pattern =
     [ regex "sonraki|önümüzdeki"
-    , dimension Time
+    , Predicate isATimeOfDay
     ]
   , prod = \case
       (_:Token Time td:_) -> tt $ withDirection TTime.After td
@@ -1030,21 +1022,6 @@ rulePartofdayOfTime = Rule
       _ -> Nothing
   }
 
-ruleMmddyyyy :: Rule
-ruleMmddyyyy = Rule
-  { name = "mm/dd/yyyy"
-  , pattern =
-    [ regex "([012]?[1-9]|10|20|30|31)\\.(0?[1-9]|10|11|12)\\.(\\d{2,4})"
-    ]
-  , prod = \case
-      (Token RegexMatch (GroupMatch (m1:m2:m3:_)):_) -> do
-        y <- parseInt m3
-        m <- parseInt m2
-        d <- parseInt m1
-        tt $ yearMonthDay y m d
-      _ -> Nothing
-  }
-
 ruleTimezone :: Rule
 ruleTimezone = Rule
   { name = "<time> timezone"
@@ -1061,7 +1038,7 @@ ruleTimezone = Rule
 
 rules :: [Rule]
 rules =
-  [ruleAbsorptionOfAfterNamedDay
+  [ ruleAbsorptionOfAfterNamedDay
   , ruleAfterTimeofday
   , ruleAfternoon
   , ruleAtTimeofday
@@ -1097,9 +1074,9 @@ rules =
   , ruleNextTime
   , ruleLunch
   , ruleMidnighteodendOfDay
-  , ruleMmdd
-  , ruleMmddyyyy
-  , ruleMorning
+  , ruleMMDD
+  , ruleMMDDYYYY
+  , ruleYYYYMMDD
   , ruleNamedmonthDayofmonthNonOrdinal
   , ruleNextCycle
   , ruleNextNCycle
@@ -1118,7 +1095,6 @@ rules =
   , ruleThisPartofday
   , ruleThisTime
   , ruleThisnextDayofweek
-  , ruleTimeAfterNext
   , ruleTimePartofday
   , ruleTimeofdayLatent
   , ruleTimeofdayTimeofdayInterval
@@ -1129,7 +1105,6 @@ rules =
   , ruleYear
   , ruleYearLatent
   , ruleYearLatent2
-  , ruleYyyymmdd
   , ruleTimezone
   ]
   ++ ruleInstants
diff --git a/duckling.cabal b/duckling.cabal
index d0984e429..06e9e6903 100644
--- a/duckling.cabal
+++ b/duckling.cabal
@@ -1161,6 +1161,7 @@ test-suite duckling-test
                      , Duckling.Time.RO.Tests
                      , Duckling.Time.RU.Tests
                      , Duckling.Time.SV.Tests
+                     , Duckling.Time.TR.Tests
                      , Duckling.Time.UK.Tests
                      , Duckling.Time.VI.Tests
                      , Duckling.Time.ZH.Tests
diff --git a/exe/Duckling/Ranking/Generate.hs b/exe/Duckling/Ranking/Generate.hs
index 3b0d9fbd9..16e0d46f2 100644
--- a/exe/Duckling/Ranking/Generate.hs
+++ b/exe/Duckling/Ranking/Generate.hs
@@ -55,6 +55,7 @@ import qualified Duckling.Time.PT.Corpus as PTTime
 import qualified Duckling.Time.RO.Corpus as ROTime
 import qualified Duckling.Time.RU.Corpus as RUTime
 import qualified Duckling.Time.SV.Corpus as SVTime
+import qualified Duckling.Time.TR.Corpus as TRTime
 import qualified Duckling.Time.UK.Corpus as UKTime
 import qualified Duckling.Time.VI.Corpus as VITime
 import qualified Duckling.Time.ZH.Corpus as ZHTime
@@ -221,7 +222,7 @@ getCorpusForLang = \case
   TA -> (testContext, testOptions, [])
   TE -> (testContext, testOptions, [])
   TH -> (testContext, testOptions, [])
-  TR -> (testContext, testOptions, [])
+  TR -> TRTime.corpus
   UK -> UKTime.corpus
   VI -> VITime.corpus
   ZH -> ZHTime.corpus
diff --git a/tests/Duckling/Time/Tests.hs b/tests/Duckling/Time/Tests.hs
index a60030fca..f6d2e3289 100644
--- a/tests/Duckling/Time/Tests.hs
+++ b/tests/Duckling/Time/Tests.hs
@@ -47,6 +47,7 @@ import qualified Duckling.Time.PT.Tests as PT
 import qualified Duckling.Time.RO.Tests as RO
 import qualified Duckling.Time.RU.Tests as RU
 import qualified Duckling.Time.SV.Tests as SV
+import qualified Duckling.Time.TR.Tests as TR
 import qualified Duckling.Time.UK.Tests as UK
 import qualified Duckling.Time.VI.Tests as VI
 import qualified Duckling.Time.ZH.Tests as ZH
@@ -77,6 +78,7 @@ tests = testGroup "Time Tests"
   , RO.tests
   , RU.tests
   , SV.tests
+  , TR.tests
   , UK.tests
   , VI.tests
   , ZH.tests

From 30b3d29e86030f2cb71291f8670b0df5d8c22aba Mon Sep 17 00:00:00 2001
From: Alex Kapranoff <kappa@fb.com>
Date: Tue, 30 Nov 2021 09:42:37 -0800
Subject: [PATCH 2/9] (Time/TimeGrain/Ordinal)/RU_XX: several extra Time forms
 for Russian

Summary:
Some changes were originally suggested by me during the review of
https://github.com/facebook/duckling/pull/474.
Others are new.

1. "Day after tomorrow/before yesterday"
2. Ordinals in the form of number+suffix like "8th of March"
3. Tuesdays require a special preposition.
4. Support "Yo" (U+0451) in "fourth" and "during daylight".
5. Support special perposition for "next week".
6. Support "one before last" adjective for time grains.
7. Proper suffixes for "quarter" grain.
8. Support "at midnight".
9. Support alternative flag for "afternoon".

Changes in Ordinal and TimeGrain are all driven by the new examples in the
corpus for Time.

There are also a couple of bugfixes:
1. A hidden latin "e" was present in an otherwise Cyrillic regex.
2. Wrong order of options in a regex separated with "|" prevented some matches.

Reviewed By: haoxuany

Differential Revision: D32311714

fbshipit-source-id: 084f6c3893eb5bfd767c267f558b910c6854eb59
---
 Duckling/Ordinal/RU/Corpus.hs         |   77 ++
 Duckling/Ordinal/RU/Rules.hs          |   18 +-
 Duckling/Ranking/Classifiers/RU_XX.hs | 1228 ++++++++++++++++---------
 Duckling/Time/RU/Corpus.hs            |  118 ++-
 Duckling/Time/RU/Rules.hs             |   57 +-
 Duckling/TimeGrain/RU/Rules.hs        |    8 +-
 6 files changed, 1019 insertions(+), 487 deletions(-)

diff --git a/Duckling/Ordinal/RU/Corpus.hs b/Duckling/Ordinal/RU/Corpus.hs
index 33e4d3000..fea86b12a 100644
--- a/Duckling/Ordinal/RU/Corpus.hs
+++ b/Duckling/Ordinal/RU/Corpus.hs
@@ -30,6 +30,7 @@ allExamples = concat
              , "первое"
              , "первой"
              , "первого"
+             , "первые"
              , "1ая"
              , "1-ая"
              , "1ый"
@@ -40,6 +41,11 @@ allExamples = concat
              , "1-й"
              , "1го"
              , "1-го"
+             , "1-ого"
+             , "первой"
+             , "первым"
+             , "первому"
+             , "первым"
              ]
   , examples (OrdinalData 3)
              [ "третий"
@@ -47,6 +53,7 @@ allExamples = concat
              , "третье"
              , "третьей"
              , "третьего"
+             , "третьи"
              , "3й"
              , "3ий"
              , "3я"
@@ -61,6 +68,11 @@ allExamples = concat
              , "3-е"
              , "3-ье"
              , "3-го"
+             , "3-его"
+             , "третьей"
+             , "третьим"
+             , "третьему"
+             , "третьим"
              ]
   , examples (OrdinalData 4)
              [ "четвертый"
@@ -68,6 +80,8 @@ allExamples = concat
              , "четвертое"
              , "четвертой"
              , "четвертого"
+             , "четвёртый"
+             , "четвертые"
              , "4й"
              , "4ый"
              , "4ая"
@@ -80,39 +94,102 @@ allExamples = concat
              , "4-ое"
              , "4-ой"
              , "4-го"
+             , "4-ого"
+             , "четвертой"
+             , "четвертым"
+             , "четвёртому"
+             , "четвёртым"
              ]
   , examples (OrdinalData 15)
              [ "пятнадцатый"
              , "15й"
              , "15-й"
+             , "15-ый"
+             , "пятнадцатая"
+             , "15я"
+             , "15-я"
+             , "15-ая"
+             , "пятнадцатое"
+             , "15е"
+             , "15-е"
+             , "15-ое"
+             , "пятнадцатому"
+             , "пятнадцатые"
+             , "пятнадцатой"
+             , "пятнадцатым"
+             , "пятнадцатому"
+             , "пятнадцатым"
+             ]
+  , examples (OrdinalData 10)
+             [ "десятый"
+             , "10й"
+             , "10-й"
+             , "10-ый"
+             , "десятая"
+             , "десятой"
              ]
   , examples (OrdinalData 21)
              [ "21й"
              , "21-й"
              , "21-го"
+             , "21-ого"
              , "Двадцать первый"
              , "двадцать первый"
              , "двадцать первого"
+             , "двадцать первой"
              ]
   , examples (OrdinalData 23)
              [ "23й"
              , "23-й"
              , "двадцать третий"
              , "двадцать третьего"
+             , "двадцать третьей"
+             , "23-го"
+             , "23-его"
              ]
   , examples (OrdinalData 31)
              [ "31ый"
              , "31-ый"
              , "тридцать первый"
              ]
+  , examples (OrdinalData 30)
+             [ "30ый"
+             , "30-ый"
+             , "тридцатый"
+             ]
   , examples (OrdinalData 48)
              [ "48ое"
              , "48-ое"
              , "сорок восьмое"
              ]
+  , examples (OrdinalData 40)
+             [ "40ое"
+             , "40-ое"
+             , "сороковой"
+             , "сороковое"
+             , "сороковая"
+             ]
   , examples (OrdinalData 99)
              [ "99ый"
              , "99-й"
+             , "99-ый"
              , "девяносто девятый"
+             , "девяносто девятая"
+             ]
+  , examples (OrdinalData 90)
+             [ "90ый"
+             , "90-й"
+             , "90-ый"
+             , "девяностый"
+             , "девяностая"
+             ]
+  , examples (OrdinalData 100)
+             [ "сотое"
+             , "сотая"
+             , "сотый"
+             , "100-ая"
+             , "100-я"
+             , "100-й"
+             , "100-е"
              ]
   ]
diff --git a/Duckling/Ordinal/RU/Rules.hs b/Duckling/Ordinal/RU/Rules.hs
index 3a4f846dc..50594fd74 100644
--- a/Duckling/Ordinal/RU/Rules.hs
+++ b/Duckling/Ordinal/RU/Rules.hs
@@ -31,6 +31,7 @@ ordinalsFirstthMap = HashMap.fromList
   , ( "втор", 2 )
   , ( "трет", 3 )
   , ( "четверт", 4 )
+  , ( "четвёрт", 4 )
   , ( "пят", 5 )
   , ( "шест", 6 )
   , ( "седьм", 7 )
@@ -47,6 +48,14 @@ ordinalsFirstthMap = HashMap.fromList
   , ( "восемнадцат", 18 )
   , ( "девятнадцат", 19 )
   , ( "двадцат", 20 )
+  , ( "тридцат", 30 )
+  , ( "сороков", 40 )
+  , ( "пятидесят", 50 )
+  , ( "шестидесят", 60 )
+  , ( "семидесят", 70 )
+  , ( "восьмидесят", 80 )
+  , ( "девяност", 90 )
+  , ( "сот", 100 )
   ]
 
 cardinalsMap :: HashMap Text.Text Int
@@ -59,13 +68,14 @@ cardinalsMap = HashMap.fromList
   , ( "семьдесят", 70 )
   , ( "восемьдесят", 80 )
   , ( "девяносто", 90 )
+  , ( "сто", 100 )
   ]
 
 ruleOrdinalsFirstth :: Rule
 ruleOrdinalsFirstth = Rule
-  { name = "ordinals (first..19th)"
+  { name = "ordinals (first..20th, then 30th, 40th, ..., 100th)"
   , pattern =
-    [ regex "(перв|втор|трет|четверт|пят|шест|седьм|восьм|девят|десят|одиннадцат|двенадцат|тринадцат|четырнадцат|пятнадцат|шестнадцат|семнадцат|восемнадцат|девятнадцат|двадцат)(ье(го|й)?|ого|ый|ой|ий|ая|ое|ья)"
+    [ regex "(перв|втор|трет|четв[её]рт|пят|шест|седьм|восьм|девят|десят|одиннадцат|двенадцат|тринадцат|четырнадцат|пятнадцат|шестнадцат|семнадцат|восемнадцат|девятнадцат|двадцат|тридцат|сороков|пятидесят|шестидесят|семидесят|восьмидесят|девяност|сот)(ь(его|ему|ей|ем|им|их|и|е)|ого|ому|ый|ой|ий|ая|ое|ья|ом|ые|ым|ых)"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) ->
@@ -78,7 +88,7 @@ ruleOrdinal = Rule
   { name = "ordinal 21..99"
   , pattern =
     [ regex "(двадцать|тридцать|сорок|пятьдесят|шестьдесят|семьдесят|восемьдесят|девяносто)"
-    , regex "(перв|втор|трет|четверт|пят|шест|седьм|восьм|девят)(ье(го|й)?|ого|ый|ой|ий|ая|ое|ья)"
+    , regex "(перв|втор|трет|четв[её]рт|пят|шест|седьм|восьм|девят)(ье(го|й)?|ого|ому|ый|ой|ий|ая|ое|ья|ые|ым|ых)"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (m1:_)):
@@ -94,7 +104,7 @@ ruleOrdinalDigits :: Rule
 ruleOrdinalDigits = Rule
   { name = "ordinal (digits)"
   , pattern =
-    [ regex "0*(\\d+)-?((ы|о|и|а|e|ь)?(ее|й|я|е|го))"
+    [ regex "0*(\\d+)-?((ы|о|и|а|е|ь)?(ее|й|я|е|го|му?))"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) -> ordinal <$> parseInt match
diff --git a/Duckling/Ranking/Classifiers/RU_XX.hs b/Duckling/Ranking/Classifiers/RU_XX.hs
index e986d1ded..9cd5837a3 100644
--- a/Duckling/Ranking/Classifiers/RU_XX.hs
+++ b/Duckling/Ranking/Classifiers/RU_XX.hs
@@ -30,11 +30,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
@@ -48,22 +49,24 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.8096221715563133, unseen = -4.465908118654584,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 85},
+                     ClassData{prior = -0.8009798853631607, unseen = -4.634728988229636,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 101},
                    koData =
-                     ClassData{prior = -0.5888343339345626, unseen = -4.68213122712422,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 106}}),
+                     ClassData{prior = -0.5958188365993833, unseen = -4.836281906951478,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 124}}),
        ("\1057\1088\1077\1076\1072",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("integer (3..19)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -74,6 +77,20 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("\1087\1086\1079\1072\1087\1086\1079\1072\1074\1095\1077\1088\1072",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("integer (20..90)",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("\1074\1095\1077\1088\1072",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -83,49 +100,52 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.1941560144409575, unseen = -4.74493212836325,
+                     ClassData{prior = -0.20909179785855936,
+                               unseen = -4.770684624465665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time-of-day>  o'clockmorning", -3.6375861597263857),
-                                    ("until <time-of-day>afternoon", -4.04305126783455),
-                                    ("dayhour", -2.9444389791664407),
-                                    ("on <date>evening", -4.04305126783455),
-                                    ("at <time-of-day>evening", -4.04305126783455),
-                                    ("intersect by ','evening", -3.6375861597263857),
-                                    ("intersectevening", -2.2512917986064953),
-                                    ("hourhour", -1.2396908869280152),
-                                    ("\1079\1072\1074\1090\1088\1072lunch", -4.04305126783455),
-                                    ("on <date>afternoon", -3.6375861597263857),
-                                    ("at <time-of-day>afternoon", -3.6375861597263857),
-                                    ("<time-of-day>  o'clockafternoon", -2.9444389791664407),
-                                    ("until <time-of-day>morning", -4.04305126783455),
-                                    ("minutehour", -2.9444389791664407),
-                                    ("time-of-day (latent)morning", -4.04305126783455),
-                                    ("hh:mmmorning", -4.04305126783455),
-                                    ("\1074\1095\1077\1088\1072evening", -4.04305126783455),
-                                    ("time-of-day (latent)evening", -4.04305126783455),
-                                    ("\1079\1072\1074\1090\1088\1072evening", -4.04305126783455),
+                                   [("<time-of-day>  o'clockmorning", -3.6635616461296463),
+                                    ("until <time-of-day>afternoon", -4.069026754237811),
+                                    ("dayhour", -2.816263785742443),
+                                    ("on <date>evening", -4.069026754237811),
+                                    ("at <time-of-day>evening", -4.069026754237811),
+                                    ("intersect by ','evening", -3.6635616461296463),
+                                    ("intersectevening", -2.277267285009756),
+                                    ("hourhour", -1.2656663733312759),
+                                    ("\1079\1072\1074\1090\1088\1072lunch", -4.069026754237811),
+                                    ("on <date>afternoon", -3.6635616461296463),
+                                    ("at <time-of-day>afternoon", -3.6635616461296463),
+                                    ("<time-of-day>  o'clockafternoon", -2.9704144655697013),
+                                    ("until <time-of-day>morning", -4.069026754237811),
+                                    ("minutehour", -2.9704144655697013),
+                                    ("time-of-day (latent)morning", -4.069026754237811),
+                                    ("hh:mmmorning", -4.069026754237811),
+                                    ("\1074\1095\1077\1088\1072evening", -4.069026754237811),
+                                    ("time-of-day (latent)evening", -4.069026754237811),
+                                    ("\1079\1072\1074\1090\1088\1072evening", -4.069026754237811),
                                     ("\1089\1077\1075\1086\1076\1085\1103afternoon",
-                                     -4.04305126783455),
-                                    ("<time-of-day>  o'clockevening", -3.6375861597263857),
+                                     -3.6635616461296463),
+                                    ("<time-of-day>  o'clockevening", -3.6635616461296463),
                                     ("\1089\1077\1075\1086\1076\1085\1103evening",
-                                     -4.04305126783455),
-                                    ("hh:mmnight", -4.04305126783455),
-                                    ("hh:mmafternoon", -4.04305126783455),
-                                    ("on <date>morning", -4.04305126783455),
-                                    ("at <time-of-day>morning", -4.04305126783455)],
-                               n = 42},
-                   koData =
-                     ClassData{prior = -1.7346010553881064, unseen = -3.891820298110627,
+                                     -4.069026754237811),
+                                    ("hh:mmnight", -4.069026754237811),
+                                    ("hh:mmafternoon", -4.069026754237811),
+                                    ("on <date>morning", -4.069026754237811),
+                                    ("at <time-of-day>morning", -4.069026754237811)],
+                               n = 43},
+                   koData =
+                     ClassData{prior = -1.667706820558076, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.772588722239781),
-                                    ("intersectevening", -2.4849066497880004),
-                                    ("hourhour", -1.791759469228055),
-                                    ("year (latent)afternoon", -3.1780538303479458),
-                                    ("year (latent)night", -3.1780538303479458),
-                                    ("time-of-day (latent)afternoon", -2.2617630984737906)],
-                               n = 9}}),
+                                   [("dayhour", -3.2386784521643803),
+                                    ("yearhour", -2.833213344056216),
+                                    ("intersectevening", -2.5455312716044354),
+                                    ("hourhour", -1.8523840910444898),
+                                    ("<day-of-month> (ordinal)morning", -3.2386784521643803),
+                                    ("year (latent)afternoon", -3.2386784521643803),
+                                    ("year (latent)night", -3.2386784521643803),
+                                    ("time-of-day (latent)afternoon", -2.322387720290225)],
+                               n = 10}}),
        ("numbers prefix with -, minus",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -139,68 +159,69 @@ classifiers
                                n = 22}}),
        ("mm/dd",
         Classifier{okData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                     ClassData{prior = -0.7801585575495751,
+                               unseen = -2.5649493574615367,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 11},
                    koData =
-                     ClassData{prior = -0.5389965007326869, unseen = -2.772588722239781,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 14}}),
+                     ClassData{prior = -0.6131044728864089, unseen = -2.70805020110221,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 13}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628, unseen = -4.0943445622221,
+                     ClassData{prior = -8.4557388028063e-2, unseen = -4.31748811353631,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time-of-day>  o'clock", -1.7749523509116738),
-                                    ("time-of-day (latent)", -1.3049487216659381),
-                                    ("hh:mm", -2.691243082785829), ("hour", -0.8586616190375187),
-                                    ("minute", -2.691243082785829)],
-                               n = 27},
+                                   [("<time-of-day>  o'clock", -1.8191584434161694),
+                                    ("time-of-day (latent)", -1.3083328196501787),
+                                    ("hh:mm", -2.917770732084279), ("noon", -3.6109179126442243),
+                                    ("hour", -0.8383291904044432), ("minute", -2.917770732084279)],
+                               n = 34},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -2.512305623976115, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.0116009116784799),
-                                    ("hour", -1.0116009116784799)],
+                                   [("time-of-day (latent)", -1.0986122886681098),
+                                    ("hour", -1.0986122886681098)],
                                n = 3}}),
        ("absorption of , after named day",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
+                     ClassData{prior = 0.0, unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
                                    [("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082",
-                                     -1.9924301646902063),
-                                    ("\1057\1088\1077\1076\1072", -2.3978952727983707),
+                                     -2.0794415416798357),
+                                    ("\1057\1088\1077\1076\1072", -2.0794415416798357),
                                     ("\1042\1086\1089\1082\1088\1077\1089\1077\1085\1100\1077",
-                                     -2.3978952727983707),
-                                    ("day", -0.8938178760220964),
-                                    ("\1057\1091\1073\1073\1086\1090\1072", -2.3978952727983707),
-                                    ("\1055\1103\1090\1085\1080\1094\1072", -1.7047480922384253)],
-                               n = 8},
+                                     -2.4849066497880004),
+                                    ("day", -0.8754687373538999),
+                                    ("\1057\1091\1073\1073\1086\1090\1072", -2.4849066497880004),
+                                    ("\1055\1103\1090\1085\1080\1094\1072", -1.791759469228055)],
+                               n = 9},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <date>",
         Classifier{okData =
-                     ClassData{prior = -2.8170876966696335e-2,
-                               unseen = -4.406719247264253,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("<time> <part-of-day>", -2.7850112422383386),
-                                    ("<time-of-day>  o'clock", -2.0918640616783932),
-                                    ("intersect", -2.4485390056171257), ("day", -3.295836866004329),
-                                    ("time-of-day (latent)", -1.9095425048844386),
-                                    ("\1057\1091\1073\1073\1086\1090\1072", -3.7013019741124937),
-                                    ("hh:mm", -3.0081547935525483), ("hour", -0.9932517730102834),
-                                    ("this|next <day-of-week>", -3.7013019741124937),
-                                    ("minute", -2.7850112422383386)],
-                               n = 35},
-                   koData =
-                     ClassData{prior = -3.58351893845611, unseen = -2.639057329615259,
+                     ClassData{prior = 0.0, unseen = -4.653960350157523,
                                likelihoods =
                                  HashMap.fromList
-                                   [("mm/dd", -1.8718021769015913), ("day", -1.8718021769015913)],
-                               n = 1}}),
+                                   [("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082",
+                                     -3.951243718581427),
+                                    ("<time> <part-of-day>", -3.0349529867072724),
+                                    ("<time-of-day>  o'clock", -2.159484249353372),
+                                    ("intersect", -2.5649493574615367),
+                                    ("day", -2.6984807500860595),
+                                    ("time-of-day (latent)", -2.005333569526114),
+                                    ("\1057\1091\1073\1073\1086\1090\1072", -3.545778610473263),
+                                    ("hh:mm", -3.258096538021482),
+                                    ("\1042\1090\1086\1088\1085\1080\1082", -3.951243718581427),
+                                    ("\1055\1103\1090\1085\1080\1094\1072", -3.951243718581427),
+                                    ("noon", -3.951243718581427), ("hour", -1.0608719606852628),
+                                    ("this|next <day-of-week>", -3.951243718581427),
+                                    ("minute", -3.0349529867072724)],
+                               n = 45},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -2.70805020110221,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("\1050\1086\1085\1077\1094 \1084\1077\1089\1103\1094\1072",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -215,6 +236,13 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("integer 1",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("between <time-of-day> and <time-of-day> (interval)",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -229,34 +257,32 @@ classifiers
                                n = 1}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.13353139262452263,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
                    koData =
-                     ClassData{prior = -2.0794415416798357,
-                               unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -1.791759469228055, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("<time-of-day>  o'clock",
         Classifier{okData =
-                     ClassData{prior = -0.13062018241706422,
-                               unseen = -4.532599493153256,
+                     ClassData{prior = -0.13102826240640414,
+                               unseen = -4.672828834461907,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>", -2.2192034840549946),
-                                    ("on <date>", -2.2192034840549946),
-                                    ("time-of-day (latent)", -1.5260563034950494),
-                                    ("until <time-of-day>", -3.1354942159291497),
-                                    ("hour", -0.7375989431307791),
-                                    ("after <time-of-day>", -3.1354942159291497)],
-                               n = 43},
-                   koData =
-                     ClassData{prior = -2.1000608288825715,
-                               unseen = -2.9444389791664407,
+                                   [("at <time-of-day>", -2.178532444324067),
+                                    ("on <date>", -2.178532444324067),
+                                    ("time-of-day (latent)", -1.5279448781829175),
+                                    ("until <time-of-day>", -3.2771447329921766),
+                                    ("hour", -0.7316134613877414),
+                                    ("after <time-of-day>", -3.2771447329921766)],
+                               n = 50},
+                   koData =
+                     ClassData{prior = -2.097141118779237, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -0.9444616088408514),
-                                    ("hour", -0.9444616088408514)],
-                               n = 6}}),
+                                   [("time-of-day (latent)", -0.916290731874155),
+                                    ("hour", -0.916290731874155)],
+                               n = 7}}),
        ("\1053\1086\1074\1099\1081 \1075\1086\1076",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -264,6 +290,13 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("\1087\1086\1079\1072\1074\1095\1077\1088\1072",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("\1083\1077\1090\1086",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -273,129 +306,212 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hour (grain)",
         Classifier{okData =
-                     ClassData{prior = -1.7578579175523736,
-                               unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = -1.580450375560848, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
                    koData =
-                     ClassData{prior = -0.18924199963852842,
-                               unseen = -3.258096538021482,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 24}}),
+                     ClassData{prior = -0.23052365861183238,
+                               unseen = -3.367295829986474,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 27}}),
+       ("<ordinal> quarter",
+        Classifier{okData =
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -1.6094379124341003,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (first..19th)quarter (grain)", -0.6931471805599453),
+                                    ("quarter", -0.6931471805599453)],
+                               n = 1},
+                   koData =
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (first..19th)quarter (grain)", -0.6931471805599453),
+                                    ("quarter", -0.6931471805599453)],
+                               n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.18589937814183854,
-                               unseen = -5.545177444479562,
+                     ClassData{prior = -0.18924199963852842,
+                               unseen = -6.056784013228625,
                                likelihoods =
                                  HashMap.fromList
-                                   [("\1089\1077\1075\1086\1076\1085\1103on <date>",
-                                     -4.154969184038536),
-                                    ("hourday", -3.5953533961031128),
-                                    ("<datetime> - <datetime> (interval)year", -4.848116364598481),
+                                   [("\1057\1088\1077\1076\1072\1054\1082\1090\1103\1073\1088\1100",
+                                     -4.955827057601261),
+                                    ("\1089\1077\1075\1086\1076\1085\1103on <date>",
+                                     -4.66814498514948),
+                                    ("<day-of-month> (ordinal)\1040\1074\1075\1091\1089\1090",
+                                     -5.3612921657094255),
+                                    ("hourday", -4.108529197214057),
+                                    ("<datetime> - <datetime> (interval)year", -5.3612921657094255),
                                     ("\1063\1077\1090\1074\1077\1088\1075<time> timezone",
-                                     -4.442651256490317),
-                                    ("hh:mm<part-of-day> of <time>", -3.9318256327243257),
-                                    ("dayhour", -1.7346010553881064),
-                                    ("daymonth", -4.848116364598481),
-                                    ("monthyear", -4.442651256490317),
-                                    ("yearhour", -4.848116364598481),
-                                    ("intersect<time-of-day>  o'clock", -3.9318256327243257),
+                                     -4.955827057601261),
+                                    ("hh:mm<part-of-day> of <time>", -4.44500143383527),
+                                    ("dayhour", -2.204291744559312),
+                                    ("daymonth", -2.4168531865429848),
+                                    ("monthyear", -3.4894899888078337),
+                                    ("yearhour", -5.3612921657094255),
+                                    ("intersect<time-of-day>  o'clock", -4.44500143383527),
                                     ("absorption of , after named daymm/dd/yyyy",
-                                     -4.848116364598481),
-                                    ("intersect<time> <part-of-day>", -3.9318256327243257),
-                                    ("intersect by ','year", -4.442651256490317),
-                                    ("on <date><time-of-day>  o'clock", -4.442651256490317),
-                                    ("mm/dd<time-of-day>  o'clock", -4.442651256490317),
-                                    ("on <date>at <time-of-day>", -4.442651256490317),
-                                    ("\1079\1072\1074\1090\1088\1072on <date>", -4.848116364598481),
-                                    ("dayday", -3.056356895370426),
+                                     -5.3612921657094255),
+                                    ("intersect<time> <part-of-day>", -4.44500143383527),
+                                    ("intersect by ','year", -4.955827057601261),
+                                    ("<day-of-month> (ordinal)\1060\1077\1074\1088\1072\1083\1100",
+                                     -3.4153820166541116),
+                                    ("on <date><time-of-day>  o'clock", -4.955827057601261),
+                                    ("<day-of-month> (ordinal)\1054\1082\1090\1103\1073\1088\1100",
+                                     -4.955827057601261),
+                                    ("mm/dd<time-of-day>  o'clock", -4.955827057601261),
+                                    ("<day-of-month> (ordinal)\1042\1090\1086\1088\1085\1080\1082",
+                                     -5.3612921657094255),
+                                    ("on <date>at <time-of-day>", -4.66814498514948),
+                                    ("\1079\1072\1074\1090\1088\1072on <date>",
+                                     -5.3612921657094255),
+                                    ("dayday", -3.0587070727153796),
                                     ("at <time-of-day>\1079\1072\1074\1090\1088\1072",
-                                     -4.848116364598481),
-                                    ("mm/ddat <time-of-day>", -4.442651256490317),
-                                    ("on <date>\1079\1072\1074\1090\1088\1072", -4.848116364598481),
-                                    ("hh:mmintersect by ','", -4.848116364598481),
+                                     -5.3612921657094255),
+                                    ("mm/ddat <time-of-day>", -4.955827057601261),
+                                    ("<day-of-month> (ordinal)intersect", -3.6565440734709997),
+                                    ("on <date>\1079\1072\1074\1090\1088\1072",
+                                     -5.3612921657094255),
+                                    ("hh:mmintersect by ','", -5.3612921657094255),
+                                    ("<day-of-month> (ordinal)\1040\1087\1088\1077\1083\1100",
+                                     -5.3612921657094255),
                                     ("<day-of-month> (ordinal)\1052\1072\1088\1090",
-                                     -4.848116364598481),
+                                     -4.2626798770413155),
                                     ("intersect<day-of-month> (non ordinal) <named-month>",
-                                     -4.442651256490317),
-                                    ("dayyear", -2.9763141876968895),
+                                     -4.955827057601261),
+                                    ("dayyear", -2.653241964607215),
                                     ("<day-of-month> (non ordinal) <named-month>intersect",
-                                     -4.848116364598481),
-                                    ("\1053\1086\1103\1073\1088\1100year", -4.848116364598481),
-                                    ("minutehour", -3.5953533961031128),
+                                     -5.3612921657094255),
+                                    ("\1057\1077\1085\1090\1103\1073\1088\1100year",
+                                     -5.3612921657094255),
+                                    ("<day-of-month>(ordinal) <named-month>year",
+                                     -3.9749978045895347),
+                                    ("\1053\1086\1103\1073\1088\1100year", -5.3612921657094255),
+                                    ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
+                                     -5.3612921657094255),
+                                    ("minutehour", -4.108529197214057),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -3.46182200347859),
+                                     -3.9749978045895347),
+                                    ("\1057\1088\1077\1076\1072intersect", -5.3612921657094255),
+                                    ("<day-of-month> (ordinal)\1057\1088\1077\1076\1072",
+                                     -5.3612921657094255),
                                     ("\1089\1077\1075\1086\1076\1085\1103<time> <part-of-day>",
-                                     -4.442651256490317),
+                                     -4.955827057601261),
+                                    ("<day-of-month> (ordinal)\1052\1072\1081",
+                                     -5.3612921657094255),
                                     ("\1089\1077\1075\1086\1076\1085\1103at <time-of-day>",
-                                     -3.9318256327243257),
-                                    ("hh:mmintersect", -4.848116364598481),
-                                    ("\1054\1082\1090\1103\1073\1088\1100year", -4.848116364598481),
-                                    ("intersect by ','intersect", -4.848116364598481),
-                                    ("dayminute", -3.9318256327243257),
-                                    ("<time> <part-of-day>intersect", -4.848116364598481),
-                                    ("intersectyear", -4.442651256490317),
-                                    ("minuteday", -3.5953533961031128),
+                                     -4.44500143383527),
+                                    ("hh:mmintersect", -5.3612921657094255),
+                                    ("\1054\1082\1090\1103\1073\1088\1100year",
+                                     -4.2626798770413155),
+                                    ("intersect by ','intersect", -5.3612921657094255),
+                                    ("absorption of , after named day<day-of-month> (ordinal)",
+                                     -5.3612921657094255),
+                                    ("dayminute", -4.44500143383527),
+                                    ("<time> <part-of-day>intersect", -5.3612921657094255),
+                                    ("intersect by ','\1060\1077\1074\1088\1072\1083\1100",
+                                     -5.3612921657094255),
+                                    ("intersectyear", -3.4894899888078337),
+                                    ("\1040\1087\1088\1077\1083\1100year", -5.3612921657094255),
+                                    ("minuteday", -4.108529197214057),
                                     ("absorption of , after named dayintersect",
-                                     -3.9318256327243257),
+                                     -4.2626798770413155),
                                     ("\1079\1072\1074\1090\1088\1072<time-of-day>  o'clock",
-                                     -4.442651256490317),
-                                    ("year<time-of-day>  o'clock", -4.848116364598481),
+                                     -4.955827057601261),
+                                    ("intersect\1060\1077\1074\1088\1072\1083\1100",
+                                     -5.3612921657094255),
+                                    ("year<time-of-day>  o'clock", -5.3612921657094255),
+                                    ("intersect\1054\1082\1090\1103\1073\1088\1100",
+                                     -5.3612921657094255),
                                     ("<time-of-day>  o'clock\1079\1072\1074\1090\1088\1072",
-                                     -4.154969184038536),
+                                     -4.66814498514948),
                                     ("\1057\1091\1073\1073\1086\1090\1072on <date>",
-                                     -4.848116364598481),
-                                    ("intersect by ','<time> <part-of-day>", -4.848116364598481),
+                                     -5.3612921657094255),
+                                    ("intersect by ','<time> <part-of-day>", -5.3612921657094255),
                                     ("\1057\1091\1073\1073\1086\1090\1072at <time-of-day>",
-                                     -4.442651256490317),
-                                    ("<time> <part-of-day>intersect by ','", -4.848116364598481),
+                                     -4.66814498514948),
+                                    ("<time> <part-of-day>intersect by ','", -5.3612921657094255),
                                     ("<time> <part-of-day>\1057\1091\1073\1073\1086\1090\1072",
-                                     -4.848116364598481),
-                                    ("mm/ddyear", -4.442651256490317),
-                                    ("intersect by ','<time-of-day>  o'clock", -4.848116364598481),
-                                    ("absorption of , after named daymm/dd", -4.848116364598481),
-                                    ("mm/ddon <date>", -4.848116364598481),
+                                     -5.3612921657094255),
+                                    ("\1042\1090\1086\1088\1085\1080\1082next <cycle>",
+                                     -5.3612921657094255),
+                                    ("mm/ddyear", -4.955827057601261),
+                                    ("intersect by ','<time-of-day>  o'clock", -5.3612921657094255),
+                                    ("absorption of , after named daymm/dd", -5.3612921657094255),
+                                    ("mm/ddon <date>", -5.3612921657094255),
                                     ("<time> <part-of-day>absorption of , after named day",
-                                     -4.848116364598481),
-                                    ("intersectintersect", -4.848116364598481),
+                                     -5.3612921657094255),
+                                    ("intersectintersect", -4.955827057601261),
                                     ("<part-of-day> of <time><day-of-month> (non ordinal) <named-month>",
-                                     -4.848116364598481),
+                                     -5.3612921657094255),
                                     ("\1057\1091\1073\1073\1086\1090\1072<time-of-day>  o'clock",
-                                     -4.442651256490317),
-                                    ("on <date>on <date>", -4.848116364598481),
+                                     -4.955827057601261),
+                                    ("on <date>on <date>", -5.3612921657094255),
+                                    ("dayweek", -5.3612921657094255),
                                     ("\1079\1072\1074\1090\1088\1072at <time-of-day>",
-                                     -4.442651256490317),
+                                     -4.955827057601261),
+                                    ("weekyear", -5.3612921657094255),
+                                    ("\1052\1072\1081year", -5.3612921657094255),
+                                    ("last <cycle> of <time>year", -5.3612921657094255),
                                     ("\1089\1077\1075\1086\1076\1085\1103<time-of-day>  o'clock",
-                                     -4.442651256490317),
+                                     -4.955827057601261),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -3.7495040759303713)],
-                               n = 93},
+                                     -4.2626798770413155),
+                                    ("\1052\1072\1088\1090year", -4.66814498514948)],
+                               n = 168},
                    koData =
-                     ClassData{prior = -1.7740598921286541, unseen = -4.68213122712422,
+                     ClassData{prior = -1.7578579175523736, unseen = -5.081404364984463,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -3.979681653901961),
-                                    ("monthyear", -2.8810693652338513),
-                                    ("yearhour", -3.979681653901961),
-                                    ("intersect<time-of-day>  o'clock", -3.979681653901961),
-                                    ("intersect<time> <part-of-day>", -3.979681653901961),
-                                    ("absorption of , after named dayhh:mm", -3.979681653901961),
-                                    ("monthhour", -3.2865344733420154),
-                                    ("hourmonth", -3.979681653901961),
-                                    ("dayyear", -2.8810693652338513),
-                                    ("\1048\1102\1083\1100year", -3.5742165457937967),
+                                   [("dayhour", -4.382026634673881),
+                                    ("daymonth", -2.772588722239781),
+                                    ("monthyear", -3.283414346005772),
+                                    ("yearhour", -4.382026634673881),
+                                    ("intersect<time-of-day>  o'clock", -4.382026634673881),
+                                    ("intersect<time> <part-of-day>", -4.382026634673881),
+                                    ("<day-of-month> (ordinal)\1060\1077\1074\1088\1072\1083\1100",
+                                     -3.6888794541139363),
+                                    ("<day-of-month> (ordinal)\1054\1082\1090\1103\1073\1088\1100",
+                                     -4.382026634673881),
+                                    ("monthhour", -3.6888794541139363),
+                                    ("hourmonth", -4.382026634673881),
+                                    ("<day-of-month> (ordinal)\1042\1090\1086\1088\1085\1080\1082",
+                                     -4.382026634673881),
+                                    ("dayday", -3.6888794541139363),
+                                    ("<day-of-month> (ordinal)intersect", -3.6888794541139363),
+                                    ("dayyear", -2.6772785424354564),
+                                    ("<day-of-month>(ordinal) <named-month>year",
+                                     -3.9765615265657175),
+                                    ("\1048\1102\1083\1100year", -3.9765615265657175),
                                     ("between <time-of-day> and <time-of-day> (interval)\1048\1102\1083\1100",
-                                     -3.979681653901961),
-                                    ("\1048\1102\1083\1100intersect", -3.979681653901961),
+                                     -4.382026634673881),
+                                    ("\1057\1088\1077\1076\1072intersect", -4.382026634673881),
+                                    ("<day-of-month> (ordinal)\1057\1088\1077\1076\1072",
+                                     -4.382026634673881),
+                                    ("\1048\1102\1083\1100intersect", -4.382026634673881),
+                                    ("<day-of-month> (ordinal)\1052\1072\1081", -4.382026634673881),
                                     ("\1089\1077\1075\1086\1076\1085\1103at <time-of-day>",
-                                     -3.979681653901961),
-                                    ("dayminute", -3.2865344733420154),
+                                     -4.382026634673881),
+                                    ("dayminute", -3.9765615265657175),
                                     ("\1063\1077\1090\1074\1077\1088\1075hh:mm",
-                                     -3.5742165457937967),
-                                    ("\1040\1087\1088\1077\1083\1100year", -3.979681653901961),
-                                    ("year<time> <part-of-day>", -3.979681653901961),
-                                    ("mm/ddyear", -2.8810693652338513),
-                                    ("\1052\1072\1088\1090year", -3.5742165457937967)],
-                               n = 19}}),
+                                     -3.9765615265657175),
+                                    ("intersectyear", -3.6888794541139363),
+                                    ("\1040\1087\1088\1077\1083\1100year", -4.382026634673881),
+                                    ("intersect\1054\1082\1090\1103\1073\1088\1100",
+                                     -4.382026634673881),
+                                    ("year<time> <part-of-day>", -4.382026634673881),
+                                    ("mm/ddyear", -3.283414346005772),
+                                    ("\1052\1072\1088\1090year", -3.9765615265657175)],
+                               n = 35}}),
        ("\1040\1087\1088\1077\1083\1100",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("\1087\1086\1089\1083\1077\1079\1072\1074\1090\1088\1072",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1},
@@ -404,24 +520,39 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.13353139262452263,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                     ClassData{prior = -0.2231435513142097,
+                               unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
-                     ClassData{prior = -2.0794415416798357,
-                               unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("next <cycle>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                     ClassData{prior = 0.0, unseen = -3.2188758248682006,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("week", -1.791759469228055),
+                                    ("month (grain)", -2.4849066497880004),
+                                    ("year (grain)", -2.0794415416798357),
+                                    ("week (grain)", -1.791759469228055),
+                                    ("quarter", -2.0794415416798357), ("year", -2.0794415416798357),
+                                    ("month", -2.4849066497880004),
+                                    ("quarter (grain)", -2.0794415416798357)],
+                               n = 8},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("one <cycle> before last",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("month (grain)", -1.3862943611198906),
-                                    ("year (grain)", -1.3862943611198906),
-                                    ("year", -1.3862943611198906), ("month", -1.3862943611198906)],
+                                   [("month (grain)", -0.6931471805599453),
+                                    ("month", -0.6931471805599453)],
                                n = 2},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
@@ -439,10 +570,29 @@ classifiers
                      ClassData{prior = -0.45198512374305727,
                                unseen = -2.1972245773362196,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
+       ("<ordinal> quarter <year>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarteryear", -0.6931471805599453),
+                                    ("ordinals (first..19th)quarter (grain)year",
+                                     -0.6931471805599453)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("\1054\1082\1090\1103\1073\1088\1100",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("ordinal 21..99",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -460,22 +610,46 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("nth <time> of <time>",
+        Classifier{okData =
+                     ClassData{prior = -0.5596157879354228, unseen = -2.772588722239781,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.6094379124341003),
+                                    ("dayyear", -1.6094379124341003),
+                                    ("ordinals (first..19th)\1057\1088\1077\1076\1072intersect",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..19th)intersectyear", -1.6094379124341003)],
+                               n = 4},
+                   koData =
+                     ClassData{prior = -0.8472978603872037, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.466337068793427),
+                                    ("monthyear", -1.8718021769015913),
+                                    ("ordinals (first..19th)\1057\1088\1077\1076\1072\1054\1082\1090\1103\1073\1088\1100",
+                                     -1.466337068793427),
+                                    ("ordinals (first..19th)\1052\1072\1081year",
+                                     -1.8718021769015913)],
+                               n = 3}}),
        ("\1042\1086\1089\1082\1088\1077\1089\1077\1085\1100\1077",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
+                     ClassData{prior = -0.12516314295400605,
+                               unseen = -2.833213344056216,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -2.1400661634962708,
+                               unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -493,16 +667,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month>(ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.19671029424605427, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..19th)\1052\1072\1088\1090",
-                                     -0.6931471805599453),
-                                    ("month", -0.6931471805599453)],
-                               n = 1},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                                   [("ordinals (first..19th)\1060\1077\1074\1088\1072\1083\1100",
+                                     -2.691243082785829),
+                                    ("ordinals (first..19th)\1040\1087\1088\1077\1083\1100",
+                                     -3.3843902633457743),
+                                    ("ordinal 21..99\1054\1082\1090\1103\1073\1088\1100",
+                                     -3.3843902633457743),
+                                    ("ordinal (digits)\1052\1072\1088\1090", -2.9789251552376097),
+                                    ("ordinals (first..19th)\1040\1074\1075\1091\1089\1090",
+                                     -3.3843902633457743),
+                                    ("ordinals (first..19th)\1052\1072\1088\1090",
+                                     -2.691243082785829),
+                                    ("ordinal 21..99\1060\1077\1074\1088\1072\1083\1100",
+                                     -2.691243082785829),
+                                    ("month", -0.8994836135577737),
+                                    ("ordinal (digits)\1054\1082\1090\1103\1073\1088\1100",
+                                     -3.3843902633457743),
+                                    ("ordinal (digits)\1060\1077\1074\1088\1072\1083\1100",
+                                     -1.9980959022258835),
+                                    ("ordinal 21..99\1052\1072\1081", -3.3843902633457743)],
+                               n = 23},
+                   koData =
+                     ClassData{prior = -1.7227665977411035,
+                               unseen = -3.1780538303479458,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (first..19th)\1060\1077\1074\1088\1072\1083\1100",
+                                     -1.749199854809259),
+                                    ("ordinals (first..19th)\1054\1082\1090\1103\1073\1088\1100",
+                                     -2.4423470353692043),
+                                    ("month", -1.3437347467010947),
+                                    ("ordinals (first..19th)\1052\1072\1081", -2.4423470353692043)],
+                               n = 5}}),
        ("\1048\1102\1083\1100",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -519,15 +718,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1040\1074\1075\1091\1089\1090",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1057\1077\1085\1090\1103\1073\1088\1100",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -540,18 +739,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("afternoon",
         Classifier{okData =
-                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = -0.587786664902119, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
-                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
+                     ClassData{prior = -0.8109302162163288, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                     ClassData{prior = -0.2876820724517809,
+                               unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.3862943611198906,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("night",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -561,131 +762,148 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1079\1072\1074\1090\1088\1072",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5108256237659907,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -0.42608439531090014,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.10536051565782628),
-                                    ("integer (3..19)", -2.70805020110221)],
-                               n = 27},
+                                   [("integer (numeric)", -0.1823215567939546),
+                                    ("integer (3..19)", -2.1972245773362196)],
+                               n = 32},
                    koData =
-                     ClassData{prior = -0.916290731874155, unseen = -3.0910424533583156,
+                     ClassData{prior = -1.0586069540544105,
+                               unseen = -3.0910424533583156,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.3364722366212129),
+                                   [("integer (numeric)", -0.4795730802618862),
                                     ("integer (3..19)", -1.9459101490553135),
+                                    ("integer 1", -2.3513752571634776),
                                     ("integer 2", -1.9459101490553135)],
-                               n = 18}}),
+                               n = 17}}),
+       ("\1087\1086\1089\1083\1077\1087\1086\1089\1083\1077\1079\1072\1074\1090\1088\1072",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.3364722366212129,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.3101549283038396,
+                               unseen = -3.1780538303479458,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 10},
+                               n = 22},
                    koData =
-                     ClassData{prior = -1.252762968495368, unseen = -1.791759469228055,
+                     ClassData{prior = -1.3217558399823195,
+                               unseen = -2.3025850929940455,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 4}}),
+                               n = 8}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -1.2383742310432684, unseen = -4.23410650459726,
+                     ClassData{prior = -1.252762968495368, unseen = -4.304065093204169,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.4277482359480516),
-                                    ("integer 2week (grain)", -3.5263605246161616),
-                                    ("integer (numeric)day (grain)", -2.833213344056216),
-                                    ("second", -3.5263605246161616),
-                                    ("integer 2hour (grain)", -3.5263605246161616),
-                                    ("integer (numeric)second (grain) ", -3.5263605246161616),
-                                    ("integer (numeric)year (grain)", -3.5263605246161616),
-                                    ("day", -2.833213344056216), ("year", -3.120895416507997),
-                                    ("integer (3..19)week (grain)", -3.5263605246161616),
-                                    ("integer (numeric)week (grain)", -2.833213344056216),
-                                    ("hour", -2.833213344056216), ("month", -3.5263605246161616),
-                                    ("integer (numeric)minute (grain)", -2.4277482359480516),
-                                    ("integer (3..19)month (grain)", -3.5263605246161616),
-                                    ("minute", -2.4277482359480516),
-                                    ("integer (numeric)hour (grain)", -3.120895416507997),
-                                    ("integer 2year (grain)", -3.5263605246161616)],
-                               n = 20},
-                   koData =
-                     ClassData{prior = -0.3422862064866327, unseen = -4.844187086458591,
+                                   [("week", -2.498699971920336),
+                                    ("integer 2week (grain)", -3.597312260588446),
+                                    ("integer (numeric)day (grain)", -2.681021528714291),
+                                    ("integer 1hour (grain)", -3.597312260588446),
+                                    ("second", -3.597312260588446),
+                                    ("integer 2hour (grain)", -3.597312260588446),
+                                    ("integer (numeric)second (grain) ", -3.597312260588446),
+                                    ("integer (numeric)year (grain)", -3.597312260588446),
+                                    ("day", -2.681021528714291), ("year", -3.1918471524802814),
+                                    ("integer (3..19)week (grain)", -3.597312260588446),
+                                    ("integer (numeric)week (grain)", -2.9041650800285006),
+                                    ("hour", -2.681021528714291), ("month", -3.597312260588446),
+                                    ("integer (numeric)minute (grain)", -2.498699971920336),
+                                    ("integer (3..19)month (grain)", -3.597312260588446),
+                                    ("minute", -2.498699971920336),
+                                    ("integer (numeric)hour (grain)", -3.1918471524802814),
+                                    ("integer 2year (grain)", -3.597312260588446)],
+                               n = 22},
+                   koData =
+                     ClassData{prior = -0.3364722366212129, unseen = -4.941642422609305,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.2268439945173775),
-                                    ("integer 2week (grain)", -4.143134726391533),
-                                    ("integer (numeric)day (grain)", -3.4499875458315876),
-                                    ("integer (3..19)day (grain)", -4.143134726391533),
-                                    ("integer 2minute (grain)", -4.143134726391533),
-                                    ("second", -3.2268439945173775),
-                                    ("integer 2month (grain)", -4.143134726391533),
-                                    ("integer (3..19)second (grain) ", -4.143134726391533),
-                                    ("integer (numeric)second (grain) ", -3.7376696182833684),
-                                    ("integer (numeric)year (grain)", -3.7376696182833684),
-                                    ("integer (3..19)year (grain)", -4.143134726391533),
-                                    ("day", -3.044522437723423), ("year", -3.2268439945173775),
-                                    ("integer (3..19)week (grain)", -4.143134726391533),
-                                    ("integer 2day (grain)", -4.143134726391533),
-                                    ("integer (numeric)week (grain)", -3.7376696182833684),
-                                    ("integer (3..19)minute (grain)", -4.143134726391533),
-                                    ("hour", -1.6174060820832774), ("month", -3.2268439945173775),
-                                    ("integer (numeric)minute (grain)", -3.7376696182833684),
-                                    ("integer 2second (grain) ", -4.143134726391533),
-                                    ("integer (3..19)month (grain)", -4.143134726391533),
-                                    ("integer (numeric)month (grain)", -3.7376696182833684),
-                                    ("integer (3..19)hour (grain)", -4.143134726391533),
-                                    ("minute", -3.2268439945173775),
-                                    ("integer (numeric)hour (grain)", -1.6582280766035324),
-                                    ("integer 2year (grain)", -4.143134726391533)],
-                               n = 49}}),
+                                   [("week", -3.3250360206965914),
+                                    ("integer 2week (grain)", -4.241326752570746),
+                                    ("integer (numeric)day (grain)", -3.548179572010801),
+                                    ("integer (3..19)day (grain)", -4.241326752570746),
+                                    ("integer 2minute (grain)", -4.241326752570746),
+                                    ("second", -3.3250360206965914),
+                                    ("integer 2month (grain)", -4.241326752570746),
+                                    ("integer (3..19)second (grain) ", -4.241326752570746),
+                                    ("integer (numeric)second (grain) ", -3.835861644462582),
+                                    ("integer (numeric)year (grain)", -3.835861644462582),
+                                    ("integer (3..19)year (grain)", -4.241326752570746),
+                                    ("day", -3.1427144639026365), ("year", -3.3250360206965914),
+                                    ("integer (3..19)week (grain)", -4.241326752570746),
+                                    ("integer 2day (grain)", -4.241326752570746),
+                                    ("integer (numeric)week (grain)", -3.835861644462582),
+                                    ("integer (3..19)minute (grain)", -4.241326752570746),
+                                    ("hour", -1.602269422955488), ("month", -3.3250360206965914),
+                                    ("integer (numeric)minute (grain)", -3.1427144639026365),
+                                    ("integer 2second (grain) ", -4.241326752570746),
+                                    ("integer (3..19)month (grain)", -4.241326752570746),
+                                    ("integer (numeric)month (grain)", -3.835861644462582),
+                                    ("integer (3..19)hour (grain)", -3.835861644462582),
+                                    ("minute", -2.8550323914508557),
+                                    ("integer (numeric)hour (grain)", -1.6763773951092098),
+                                    ("integer 2year (grain)", -4.241326752570746)],
+                               n = 55}}),
        ("ordinals (first..19th)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = -0.5389965007326869, unseen = -2.772588722239781,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 14},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.8754687373538999,
+                               unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
        ("\1057\1091\1073\1073\1086\1090\1072",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -4.382026634673881, unseen = -2.833213344056216,
+                     ClassData{prior = -3.109060958860994, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.0794415416798357),
-                                    ("week (grain)", -2.0794415416798357)],
-                               n = 1},
-                   koData =
-                     ClassData{prior = -1.2578782206860073e-2,
-                               unseen = -5.153291594497779,
+                                   [("week", -1.8718021769015913),
+                                    ("hour (grain)", -2.5649493574615367),
+                                    ("second", -2.5649493574615367),
+                                    ("week (grain)", -1.8718021769015913),
+                                    ("second (grain) ", -2.5649493574615367),
+                                    ("hour", -2.5649493574615367)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -4.567003683318832e-2,
+                               unseen = -5.442417710521793,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.8449093838194073),
-                                    ("month (grain)", -2.9502698994772336),
-                                    ("hour (grain)", -1.7462970951512977),
-                                    ("year (grain)", -2.9502698994772336),
-                                    ("second", -3.355735007585398),
-                                    ("week (grain)", -2.8449093838194073),
-                                    ("day", -2.662587827025453),
-                                    ("minute (grain)", -2.8449093838194073),
-                                    ("year", -2.9502698994772336),
-                                    ("second (grain) ", -3.355735007585398),
-                                    ("hour", -1.7462970951512977), ("month", -2.9502698994772336),
-                                    ("minute", -2.8449093838194073),
-                                    ("day (grain)", -2.662587827025453)],
-                               n = 79}}),
+                                   [("week", -2.7300291078209855),
+                                    ("month (grain)", -2.873129951461659),
+                                    ("hour (grain)", -1.911718784307034),
+                                    ("year (grain)", -3.040184036124825),
+                                    ("second", -3.6463198396951406),
+                                    ("week (grain)", -2.7300291078209855),
+                                    ("day", -2.7300291078209855), ("quarter", -3.3586377672433594),
+                                    ("minute (grain)", -2.873129951461659),
+                                    ("year", -3.040184036124825),
+                                    ("second (grain) ", -3.6463198396951406),
+                                    ("hour", -1.911718784307034), ("month", -2.873129951461659),
+                                    ("quarter (grain)", -3.3586377672433594),
+                                    ("minute", -2.873129951461659),
+                                    ("day (grain)", -2.7300291078209855)],
+                               n = 107}}),
        ("dd.(mm.)? - dd.mm.(yy[yy]?)? (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -695,95 +913,93 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -0.6690496289808848,
-                               unseen = -3.1354942159291497,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 21},
-                   koData =
-                     ClassData{prior = -0.7178397931503169,
+                     ClassData{prior = -4.8790164169432056e-2,
                                unseen = -3.0910424533583156,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 20}}),
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
+                   koData =
+                     ClassData{prior = -3.044522437723423, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("intersect by ','",
         Classifier{okData =
-                     ClassData{prior = -6.0624621816434854e-2,
-                               unseen = -3.891820298110627,
+                     ClassData{prior = 0.0, unseen = -4.02535169073515,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1780538303479458),
-                                    ("dayhour", -2.772588722239781),
+                                   [("hourday", -3.3141860046725258),
+                                    ("dayhour", -2.908720896564361),
                                     ("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082<day-of-month> (non ordinal) <named-month>",
-                                     -2.772588722239781),
+                                     -2.908720896564361),
                                     ("\1055\1103\1090\1085\1080\1094\1072mm/dd",
-                                     -3.1780538303479458),
+                                     -3.3141860046725258),
                                     ("\1057\1088\1077\1076\1072<day-of-month> (non ordinal) <named-month>",
-                                     -3.1780538303479458),
+                                     -3.3141860046725258),
+                                    ("\1057\1088\1077\1076\1072<day-of-month>(ordinal) <named-month>",
+                                     -3.3141860046725258),
                                     ("\1055\1103\1090\1085\1080\1094\1072intersect",
-                                     -2.2617630984737906),
-                                    ("dayday", -1.3862943611198906),
+                                     -2.3978952727983707),
+                                    ("dayday", -1.2992829841302609),
                                     ("intersect<day-of-month> (non ordinal) <named-month>",
-                                     -2.772588722239781),
+                                     -2.908720896564361),
+                                    ("\1057\1088\1077\1076\1072intersect", -3.3141860046725258),
                                     ("\1057\1091\1073\1073\1086\1090\1072<day-of-month> (non ordinal) <named-month>",
-                                     -3.1780538303479458),
-                                    ("minuteday", -2.772588722239781),
+                                     -3.3141860046725258),
+                                    ("minuteday", -2.908720896564361),
                                     ("\1055\1103\1090\1085\1080\1094\1072mm/dd/yyyy",
-                                     -3.1780538303479458),
+                                     -3.3141860046725258),
                                     ("\1042\1086\1089\1082\1088\1077\1089\1077\1085\1100\1077<day-of-month> (non ordinal) <named-month>",
-                                     -3.1780538303479458),
+                                     -3.3141860046725258),
                                     ("<part-of-day> of <time><day-of-month> (non ordinal) <named-month>",
-                                     -3.1780538303479458),
+                                     -3.3141860046725258),
                                     ("\1055\1103\1090\1085\1080\1094\1072<day-of-month> (non ordinal) <named-month>",
-                                     -2.772588722239781)],
-                               n = 16},
+                                     -2.908720896564361),
+                                    ("\1057\1088\1077\1076\1072<day-of-month> (ordinal)",
+                                     -3.3141860046725258)],
+                               n = 19},
                    koData =
-                     ClassData{prior = -2.833213344056216, unseen = -2.9444389791664407,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("\1055\1103\1090\1085\1080\1094\1072hh:mm",
-                                     -2.1972245773362196),
-                                    ("dayminute", -2.1972245773362196)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("second (grain) ",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1042\1090\1086\1088\1085\1080\1082",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("\1055\1103\1090\1085\1080\1094\1072",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<duration> ago",
         Classifier{okData =
-                     ClassData{prior = -0.5596157879354228,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -0.5306282510621704, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.4816045409242156), ("day", -1.9924301646902063),
-                                    ("year", -2.3978952727983707),
-                                    ("<integer> <unit-of-duration>", -1.0116009116784799),
-                                    ("a <unit-of-duration>", -2.3978952727983707),
-                                    ("month", -2.3978952727983707)],
-                               n = 8},
+                                   [("week", -1.466337068793427), ("day", -1.8718021769015913),
+                                    ("year", -2.5649493574615367),
+                                    ("<integer> <unit-of-duration>", -1.0608719606852628),
+                                    ("a <unit-of-duration>", -2.159484249353372),
+                                    ("month", -2.5649493574615367)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -0.8472978603872037,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -0.8873031950009028, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.791759469228055), ("day", -1.791759469228055),
-                                    ("year", -2.1972245773362196),
-                                    ("a <unit-of-duration>", -0.9444616088408514),
-                                    ("month", -2.1972245773362196)],
-                               n = 6}}),
+                                   [("week", -1.8971199848858813), ("day", -1.6094379124341003),
+                                    ("year", -2.3025850929940455),
+                                    ("a <unit-of-duration>", -0.916290731874155),
+                                    ("month", -2.3025850929940455)],
+                               n = 7}}),
        ("last <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -796,10 +1012,25 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
+        Classifier{okData =
+                     ClassData{prior = -0.44468582126144557,
+                               unseen = -3.367295829986474,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinal 21..99", -1.540445040947149),
+                                    ("ordinals (first..19th)", -0.9343092373768334),
+                                    ("ordinal (digits)", -0.9343092373768334)],
+                               n = 25},
+                   koData =
+                     ClassData{prior = -1.024504316514388, unseen = -2.890371757896165,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (first..19th)", -0.12516314295400605)],
+                               n = 14}}),
+       ("noon",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("ordinals (first..19th)", 0.0)],
-                               n = 1},
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -821,8 +1052,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1060\1077\1074\1088\1072\1083\1100",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                     ClassData{prior = 0.0, unseen = -3.0910424533583156,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -849,12 +1080,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("last <cycle>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
                                    [("month (grain)", -0.6931471805599453),
                                     ("month", -0.6931471805599453)],
-                               n = 1},
+                               n = 2},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -888,73 +1119,71 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in <duration>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4657359027997265,
+                     ClassData{prior = 0.0, unseen = -3.713572066704308,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.740840023925201), ("second", -2.740840023925201),
-                                    ("day", -2.740840023925201), ("year", -2.740840023925201),
-                                    ("<integer> <unit-of-duration>", -0.8690378470236094),
-                                    ("hour", -2.0476928433652555), ("minute", -1.6422277352570913)],
-                               n = 12},
+                                   [("week", -2.5902671654458267), ("second", -2.5902671654458267),
+                                    ("day", -2.995732273553991), ("year", -2.995732273553991),
+                                    ("<integer> <unit-of-duration>", -1.0498221244986778),
+                                    ("a <unit-of-duration>", -2.3025850929940455),
+                                    ("hour", -1.8971199848858813), ("minute", -1.8971199848858813)],
+                               n = 16},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.0794415416798357,
+                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.6190392084062235, unseen = -3.295836866004329,
+                     ClassData{prior = -0.45198512374305727,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.8718021769015913),
-                                    ("hh:mmhh:mm", -1.8718021769015913),
-                                    ("dayday", -1.6486586255873816),
+                                   [("minuteminute", -1.791759469228055),
+                                    ("hh:mmhh:mm", -1.791759469228055),
+                                    ("dayday", -1.5686159179138452),
                                     ("<day-of-month> (non ordinal) <named-month><day-of-month> (non ordinal) <named-month>",
-                                     -2.159484249353372),
-                                    ("mm/ddmm/dd", -2.159484249353372)],
+                                     -2.0794415416798357),
+                                    ("mm/ddmm/dd", -2.0794415416798357)],
                                n = 7},
                    koData =
-                     ClassData{prior = -0.7731898882334817,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -1.0116009116784799,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("monthday", -2.0794415416798357),
-                                    ("mm/ddmm/dd/yyyy", -2.4849066497880004),
+                                   [("monthday", -1.791759469228055),
+                                    ("mm/ddmm/dd/yyyy", -2.1972245773362196),
                                     ("\1048\1102\1083\1100<day-of-month> (non ordinal) <named-month>",
-                                     -2.4849066497880004),
+                                     -2.1972245773362196),
                                     ("\1040\1074\1075\1091\1089\1090<day-of-month> (non ordinal) <named-month>",
-                                     -2.4849066497880004),
-                                    ("mm/ddhh:mm", -2.0794415416798357),
-                                    ("dayday", -2.0794415416798357),
-                                    ("mm/ddintersect", -2.4849066497880004),
-                                    ("dayminute", -2.0794415416798357)],
-                               n = 6}}),
+                                     -2.1972245773362196),
+                                    ("dayday", -1.791759469228055),
+                                    ("mm/ddintersect", -2.1972245773362196)],
+                               n = 4}}),
        ("\1089\1077\1075\1086\1076\1085\1103",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> - <time-of-day> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("minuteminute", -1.2809338454620642),
-                                    ("hh:mmhh:mm", -1.2809338454620642),
-                                    ("minutehour", -1.791759469228055)],
+                                   [("hh:mmtime-of-day (latent)", -1.6739764335716716),
+                                    ("minuteminute", -1.1631508098056809),
+                                    ("hh:mmhh:mm", -1.1631508098056809),
+                                    ("minutehour", -1.6739764335716716)],
                                n = 6},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -1.9459101490553135,
+                               unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh:mmtime-of-day (latent)", -1.791759469228055),
-                                    ("hourminute", -1.3862943611198906),
-                                    ("minutehour", -1.791759469228055),
-                                    ("time-of-day (latent)hh:mm", -1.3862943611198906)],
-                               n = 3}}),
+                                   [("hh:mmtime-of-day (latent)", -1.0986122886681098),
+                                    ("minutehour", -1.0986122886681098)],
+                               n = 1}}),
        ("last n <cycle>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.7612001156935624,
@@ -983,24 +1212,24 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -9.097177820572676e-2,
-                               unseen = -3.912023005428146,
+                     ClassData{prior = -9.53101798043249e-2,
+                               unseen = -3.871201010907891,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)\1052\1072\1088\1090", -2.2823823856765264),
-                                    ("integer (numeric)\1048\1102\1083\1100", -2.2823823856765264),
+                                   [("integer (numeric)\1052\1072\1088\1090", -2.463853240590168),
+                                    ("integer (numeric)\1048\1102\1083\1100", -2.2407096892759584),
                                     ("integer (numeric)\1057\1077\1085\1090\1103\1073\1088\1100",
-                                     -3.1986731175506815),
+                                     -3.1570004211501135),
                                     ("integer (numeric)\1040\1074\1075\1091\1089\1090",
-                                     -2.2823823856765264),
+                                     -2.2407096892759584),
                                     ("integer (numeric)\1040\1087\1088\1077\1083\1100",
-                                     -3.1986731175506815),
+                                     -3.1570004211501135),
                                     ("integer (numeric)\1060\1077\1074\1088\1072\1083\1100",
-                                     -1.8123787564307907),
-                                    ("month", -0.8007778447523107)],
-                               n = 21},
+                                     -1.7707060600302227),
+                                    ("month", -0.8056251639866356)],
+                               n = 20},
                    koData =
-                     ClassData{prior = -2.4423470353692043,
+                     ClassData{prior = -2.3978952727983707,
                                unseen = -2.4849066497880004,
                                likelihoods =
                                  HashMap.fromList
@@ -1009,24 +1238,85 @@ classifiers
                                n = 2}}),
        ("this|next <day-of-week>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
                                    [("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082",
+                                     -1.3862943611198906),
+                                    ("day", -0.9808292530117262),
+                                    ("\1042\1090\1086\1088\1085\1080\1082", -1.3862943611198906)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("\1057\1088\1077\1076\1072", -1.0986122886681098),
+                                    ("day", -1.0986122886681098)],
+                               n = 1}}),
+       ("ordinal (digits)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("quarter (grain)",
+        Classifier{okData =
+                     ClassData{prior = -0.3364722366212129,
+                               unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                   koData =
+                     ClassData{prior = -1.252762968495368, unseen = -1.3862943611198906,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+       ("last <cycle> of <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("weekmonth", -0.8472978603872037),
+                                    ("week (grain)\1057\1077\1085\1090\1103\1073\1088\1100",
                                      -1.252762968495368),
-                                    ("day", -0.8472978603872037),
-                                    ("\1042\1090\1086\1088\1085\1080\1082", -1.252762968495368)],
+                                    ("week (grain)intersect", -1.252762968495368)],
                                n = 2},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1052\1072\1088\1090",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("<day-of-month>(ordinal) <named-month> year",
+        Classifier{okData =
+                     ClassData{prior = -0.25131442828090605,
+                               unseen = -3.1780538303479458,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (first..19th)\1040\1087\1088\1077\1083\1100",
+                                     -2.4423470353692043),
+                                    ("ordinal 21..99\1054\1082\1090\1103\1073\1088\1100",
+                                     -2.4423470353692043),
+                                    ("ordinal (digits)\1052\1072\1088\1090", -2.4423470353692043),
+                                    ("ordinals (first..19th)\1052\1072\1088\1090",
+                                     -2.03688192726104),
+                                    ("month", -1.0560526742493137),
+                                    ("ordinal (digits)\1054\1082\1090\1103\1073\1088\1100",
+                                     -2.4423470353692043),
+                                    ("ordinal 21..99\1052\1072\1081", -2.4423470353692043)],
+                               n = 7},
+                   koData =
+                     ClassData{prior = -1.5040773967762742, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (first..19th)\1054\1082\1090\1103\1073\1088\1100",
+                                     -1.8718021769015913),
+                                    ("month", -1.466337068793427),
+                                    ("ordinals (first..19th)\1052\1072\1081", -1.8718021769015913)],
+                               n = 2}}),
        ("\1056\1086\1078\1076\1077\1089\1090\1074\1086 \1061\1088\1080\1089\1090\1086\1074\1086",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1036,11 +1326,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("morning",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                     ClassData{prior = -0.2876820724517809,
+                               unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.3862943611198906,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("week-end",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -1062,12 +1354,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("day (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.45198512374305727,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                     ClassData{prior = -0.5596157879354228,
+                               unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
-                     ClassData{prior = -1.0116009116784799, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -0.8472978603872037,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6}}),
+       ("\1052\1072\1081",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<month> dd-dd (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1079,6 +1379,30 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("composite <duration>",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hourminute", -0.6931471805599453),
+                                    ("integer (numeric)hour (grain)<integer> <unit-of-duration>",
+                                     -0.6931471805599453)],
+                               n = 1}}),
+       ("<hour-of-day> <integer> (as relative minutes)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hour", -0.6931471805599453),
+                                    ("<time-of-day>  o'clockinteger (numeric)",
+                                     -0.6931471805599453)],
+                               n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
diff --git a/Duckling/Time/RU/Corpus.hs b/Duckling/Time/RU/Corpus.hs
index a81a73935..227daa71a 100644
--- a/Duckling/Time/RU/Corpus.hs
+++ b/Duckling/Time/RU/Corpus.hs
@@ -45,24 +45,43 @@ allExamples = concat
   , examples (datetime (2013, 2, 11, 0, 0, 0) Day)
              [ "вчера"
              ]
+  , examples (datetime (2013, 2, 10, 0, 0, 0) Day)
+             [ "позавчера"
+             ]
+  , examples (datetime (2013, 2, 9, 0, 0, 0) Day)
+             [ "позапозавчера"
+             ]
   , examples (datetime (2013, 2, 13, 0, 0, 0) Day)
              [ "завтра"
              ]
+  , examples (datetime (2013, 2, 14, 0, 0, 0) Day)
+             [ "послезавтра"
+             ]
+  , examples (datetime (2013, 2, 15, 0, 0, 0) Day)
+             [ "послепослезавтра"
+             ]
   , examples (datetime (2013, 2, 18, 0, 0, 0) Day)
              [ "понедельник"
+             , "в понедельник"
              ]
   , examples (datetime (2013, 2, 18, 0, 0, 0) Day)
              [ "понедельник, 18 февраля"
              , "18 февраля"
+             , "18-е февраля"
+             , "18-го февраля"
+             , "восемнадцатое февраля"
+             , "восемнадцатого февраля"
              ]
   , examples (datetime (2013, 2, 19, 0, 0, 0) Day)
              [ "вторник"
+             , "во вторник"
              ]
   , examples (datetime (2013, 2, 14, 0, 0, 0) Day)
              [ "четверг"
              ]
   , examples (datetime (2013, 2, 15, 0, 0, 0) Day)
              [ "пятница"
+             , "в пятницу"
              ]
   , examples (datetime (2013, 2, 16, 0, 0, 0) Day)
              [ "суббота"
@@ -70,20 +89,32 @@ allExamples = concat
   , examples (datetime (2013, 3, 1, 0, 0, 0) Day)
              [ "1 марта"
              , "первое марта"
-             , "1 мар."
+             , "1-е мар."
              ]
   , examples (datetime (2015, 3, 3, 0, 0, 0) Day)
              [ "3 марта 2015"
+             , "3-его марта 2015"
              , "3 мар. 2015"
+             , "третьего марта 2015"
+             , "третье марта 2015"
+             , "к третьему марта 2015"
              ]
   , examples (datetime (2013, 2, 15, 0, 0, 0) Day)
              [ "15 февраля"
              , "15.2"
              , "15 Фев"
+             , "15-го Фев"
+             , "15.02"
+             , "пятнадцатое февраля"
+             , "пятнадцатого фев"
              ]
   , examples (datetime (2013, 8, 8, 0, 0, 0) Day)
              [ "8 августа"
              , "8 Авг"
+             , "восьмое августа"
+             ]
+  , examples (datetime (2013, 3, 0, 0, 0, 0) Month)
+             [ "март"
              ]
   , examples (datetime (2014, 10, 0, 0, 0, 0) Month)
              [ "Октябрь 2014"
@@ -94,40 +125,102 @@ allExamples = concat
   , examples (datetime (1974, 10, 31, 0, 0, 0) Day)
              [ "31.10.1974"
              , "31.10.74"
+             , "тридцать первое октября 1974"
+             , "31-ое октября 1974"
              ]
   , examples (datetime (2015, 4, 14, 0, 0, 0) Day)
              [ "14 апреля 2015"
+             , "четырнадцатое апреля 2015"
              ]
   , examples (datetime (2013, 2, 10, 0, 0, 0) Day)
              [ "Воскресенье, 10 фев."
              ]
   , examples (datetime (2013, 2, 13, 0, 0, 0) Day)
              [ "Среда, 13 февраля"
+             , "Среда, 13-е февраля"
+             , "13-е февраля"
              ]
   , examples (datetime (2013, 2, 18, 0, 0, 0) Day)
              [ "Понедельник, 18 фев"
              ]
+  , examples (datetime (2013, 2, 24, 0, 0, 0) Day)
+             [ "двадцать четвертое фев"
+             , "двадцать четвёртое февраля"
+             , "двадцать четвертого февраля"
+             , "24-ого февраля"
+             , "24-е февраля"
+             , "к двадцать четвёртому февраля"
+             ]
+  , examples (datetime (2015, 5, 31, 0, 0, 0) Day)
+             [ "тридцать первое мая 2015"
+             ]
   , examples (datetimeInterval ((2013, 2, 11, 0, 0, 0), (2013, 2, 17, 0, 0, 0)) Day)
              [ "эта неделя"
              ]
+  , examples (datetime (2013, 2, 1, 0, 0, 0) Month)
+             [ "этот месяц"
+             ]
+  , examples (datetime (2013, 1, 1, 0, 0, 0) Year)
+             [ "этот год"
+             ]
+  , examples (datetime (2013, 2, 18, 0, 0, 0) Week)
+             [ "следующая неделя"
+             ]
+  , examples (datetime (2013, 2, 18, 0, 0, 0) Week)
+             [ "на следующей неделе"
+             ]
   , examples (datetime (2013, 1, 0, 0, 0, 0) Month)
              [ "прошлый месяц"
+             , "в прошлом месяце"
+             ]
+  , examples (datetime (2012, 12, 0, 0, 0, 0) Month)
+             [ "позапрошлый месяц"
+             , "в позапрошлом месяце"
              ]
   , examples (datetime (2013, 3, 0, 0, 0, 0) Month)
              [ "следующий месяц"
+             , "в следующем месяце"
              ]
   , examples (datetime (2014, 0, 0, 0, 0, 0) Year)
              [ "следующий год"
+             , "в следующем году"
+             ]
+  , examples (datetime (2013, 1, 1, 0, 0, 0) Quarter)
+             [ "этот квартал"
+             ]
+  , examples (datetime (2013, 4, 1, 0, 0, 0) Quarter)
+             [ "следующий квартал"
+             , "в следующем квартале"
+             ]
+  , examples (datetime (2013, 7, 1, 0, 0, 0) Quarter)
+             [ "третий квартал"
+             , "в третьем квартале"
+             ]
+  , examples (datetime (2018, 10, 1, 0, 0, 0) Quarter)
+             [ "четвертый квартал 2018"
+             , "четвёртый квартал 2018"
              ]
   , examples (datetime (2013, 2, 5, 0, 0, 0) Day)
              [ "в прошлый вторник"
              ]
   , examples (datetime (2013, 2, 19, 0, 0, 0) Day)
              [ "следующий вторник"
+             , "вторник на следующей неделе"
+             ]
+  , examples (datetime (2013, 2, 13, 0, 0, 0) Day)
+             [ "следующая среда"
+             , "в следующую среду"
+             , "в след среду"
              ]
   , examples (datetime (2013, 2, 12, 4, 0, 0) Hour)
              [ "в 4 утра"
              ]
+  , examples (datetime (2013, 2, 13, 0, 0, 0) Hour)
+             [ "в полночь"
+             ]
+  , examples (datetime (2013, 2, 12, 12, 0, 0) Hour)
+             [ "в полдень"
+             ]
   , examples (datetime (2013, 2, 12, 15, 0, 0) Hour)
              [ "в 3"
              , "3 часа"
@@ -136,15 +229,15 @@ allExamples = concat
   , examples (datetime (2013, 2, 12, 3, 18, 0) Minute)
              [ "3:18 утра"
              ]
-  , examples (datetime (2013, 2, 13, 3, 18, 0) Minute)
-             [ "3:18"
-             ]
   , examples (datetime (2013, 2, 12, 15, 0, 0) Hour)
              [ "в 3 часа дня"
              , "в 15"
              , "в 15 часов"
              , "15 часов"
              , "в 15ч"
+             , "в пятнадцать часов"
+             , "в 3 часа пополудни"
+             , "в 3 часа после полудня"
              ]
   , examples (datetime (2013, 4, 1, 18, 0, 0) Hour)
              [ "01.04. в 18 часов"
@@ -153,7 +246,7 @@ allExamples = concat
              [ "в 17 часов завтра"
              ]
   , examples (datetime (2013, 2, 12, 15, 15, 0) Minute)
-             ["15:15"
+             [ "15:15"
              ]
   , examples (datetime (2013, 2, 12, 20, 0, 0) Hour)
              [ "8 часов вечера"
@@ -164,6 +257,7 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 16, 9, 0, 0) Hour)
              [ "в субботу в 9 часов"
+             , "в субботу в девять"
              ]
   , examples (datetime (2014, 7, 18, 19, 0, 0) Hour)
              [ "пятница, 18 июля 2014 7 часов вечера"
@@ -174,6 +268,7 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 12, 4, 30, 1) Second)
              [ "через 1 секунду"
+             , "через секунду"
              ]
   , examples (datetime (2013, 2, 12, 4, 31, 0) Second)
              [ "через 1 минуту"
@@ -189,6 +284,8 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 12, 5, 30, 0) Minute)
              [ "через 1 час"
+             , "через один час"
+             , "через час"
              ]
   , examples (datetime (2013, 2, 12, 6, 30, 0) Minute)
              [ "через два часа"
@@ -196,9 +293,6 @@ allExamples = concat
   , examples (datetime (2013, 2, 13, 4, 30, 0) Minute)
              [ "через 24 часа"
              ]
-  , examples (datetime (2013, 2, 13, 0, 0, 0) Day)
-             [ "завтра"
-             ]
   , examples (datetime (2016, 2, 0, 0, 0, 0) Month)
              [ "через 3 года"
              ]
@@ -207,9 +301,11 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 19, 0, 0, 0) Day)
              [ "через 1 неделю"
+             , "через неделю"
              ]
   , examples (datetime (2013, 2, 5, 4, 0, 0) Hour)
              [ "7 дней назад"
+             , "7 дней тому назад"
              ]
   , examples (datetime (2013, 1, 29, 4, 0, 0) Hour)
              [ "14 дней назад"
@@ -219,6 +315,7 @@ allExamples = concat
              ]
   , examples (datetime (2013, 2, 5, 0, 0, 0) Day)
              [ "1 неделю назад"
+             , "неделю тому назад"
              ]
   , examples (datetime (2013, 1, 22, 0, 0, 0) Day)
              [ "три недели назад"
@@ -368,6 +465,7 @@ allExamples = concat
              ]
   , examples (datetimeInterval ((2013, 2, 12, 12, 0, 0), (2013, 2, 12, 19, 0, 0)) Hour)
              [ "сегодня днем"
+             , "сегодня днём"
              ]
   , examples (datetime (2013, 2, 12, 13, 30, 0) Minute)
              [ "в 13:30 дня"
@@ -406,10 +504,10 @@ allExamples = concat
              , "с 14.10. по 15.10.2018"
              ]
   , examples (datetime (2013, 10, 10, 0, 0, 0) Day)
-             ["10.10.2013"
+             [ "10.10.2013"
              ]
   , examples (datetime (2013, 2, 12, 10, 10, 0) Minute)
-             [ "в 10.10"
+             [ "в 10:10"
              ]
   , examples (datetime (2013, 2, 12, 17, 10, 0) Minute)
              [ "17ч10"
diff --git a/Duckling/Time/RU/Rules.hs b/Duckling/Time/RU/Rules.hs
index 0314725d7..78b29d67a 100644
--- a/Duckling/Time/RU/Rules.hs
+++ b/Duckling/Time/RU/Rules.hs
@@ -36,7 +36,9 @@ ruleInstants = mkRuleInstants
   , ( "завтра"       , TG.Day    ,  1, "завтра"               )
   , ( "вчера"        , TG.Day    , -1, "вчера"                )
   , ( "послезавтра"  , TG.Day    ,  2, "послезавтра"          )
+  , ( "послепослезавтра", TG.Day ,  3, "послепослезавтра"     )
   , ( "позавчера"    , TG.Day    , -2, "позавчера"            )
+  , ( "позапозавчера", TG.Day    , -3, "позапозавчера"        )
   , ( "Конец месяца" , TG.Month  ,  1, "(конец|конца) месяца" )
   , ( "Конец года"   , TG.Year   ,  1, "(конец|конца) года"   )
   ]
@@ -93,7 +95,7 @@ ruleLastTime :: Rule
 ruleLastTime = Rule
   { name = "last <time>"
   , pattern =
-    [ regex "(в )?прошл(ый|ого|ому|ом|ые|ых|ым|ыми|ая)"
+    [ regex "(на |в )?прошл(ый|ого|ому|ом|ое|ые|ых|ыми|ым|ая|ой|ую)"
     , Predicate isOkWithThisNext
     ]
   , prod = \case
@@ -264,11 +266,20 @@ ruleNoon = Rule
   , prod = \_ -> tt $ hour False 12
   }
 
+ruleMidnight :: Rule
+ruleMidnight = Rule
+  { name = "midnight"
+  , pattern =
+    [ regex "полночь"
+    ]
+  , prod = \_ -> tt $ hour False 0
+  }
+
 ruleThisnextDayofweek :: Rule
 ruleThisnextDayofweek = Rule
   { name = "this|next <day-of-week>"
   , pattern =
-    [ regex "следующ(ий|ая|ее)"
+    [ regex "след(ующ(ий|ая|ее|ую))?"
     , Predicate isADayOfWeek
     ]
   , prod = \case
@@ -296,7 +307,7 @@ ruleNextCycle :: Rule
 ruleNextCycle = Rule
   { name = "next <cycle>"
   , pattern =
-    [ regex "(в |на )?следующ(ий|его|ему|им|ем|ие|их|ими)"
+    [ regex "(на |в |к )?след(ующ(ий|его|ему|ими|ем|ие|их|им|ей|ая|ую))?"
     , dimension TimeGrain
     ]
   , prod = \case
@@ -309,7 +320,7 @@ ruleOnDate :: Rule
 ruleOnDate = Rule
   { name = "on <date>"
   , pattern =
-    [ regex "в"
+    [ regex "во|в|к"
     , dimension Time
     ]
   , prod = \case
@@ -321,7 +332,7 @@ ruleLastCycle :: Rule
 ruleLastCycle = Rule
   { name = "last <cycle>"
   , pattern =
-    [ regex "(в )?прошл(ый|ого|ому|ым|ом|ые|ых|ыми)"
+    [ regex "(на |в )?прошл(ый|ого|ому|ом|ое|ые|ых|ыми|ым|ая|ой|ую)"
     , dimension TimeGrain
     ]
   , prod = \case
@@ -330,11 +341,24 @@ ruleLastCycle = Rule
       _ -> Nothing
   }
 
+ruleBeforeLastCycle :: Rule
+ruleBeforeLastCycle = Rule
+  { name = "one <cycle> before last"
+  , pattern =
+    [ regex "(на |в )?позапрошл(ый|ого|ому|ыми|ом|ое|ые|ых|ым|ая|ой|ую)"
+    , dimension TimeGrain
+    ]
+  , prod = \case
+      (_:Token TimeGrain grain:_) ->
+        tt . cycleNth grain $ - 2
+      _ -> Nothing
+  }
+
 ruleLastCycle2 :: Rule
 ruleLastCycle2 = Rule
   { name = "last <cycle>"
   , pattern =
-    [ regex "(в )?прошедш(ий|его|ему|им|ем|их|ие|ими)"
+    [ regex "(в )?прошедш(ий|его|ему|ими|ем|их|ие|им)"
     , dimension TimeGrain
     ]
   , prod = \case
@@ -360,7 +384,7 @@ ruleAfternoon :: Rule
 ruleAfternoon = Rule
   { name = "afternoon"
   , pattern =
-    [ regex "дня|днем"
+    [ regex "(дня|дн[её]м)|пополудни|после полудня"
     ]
   , prod = \_ ->
       let from = hour False 12
@@ -394,7 +418,6 @@ ruleNamedmonthDayofmonthOrdinal = Rule
       _ -> Nothing
   }
 
-
 ruleHourofdayIntegerAsRelativeMinutes :: Rule
 ruleHourofdayIntegerAsRelativeMinutes = Rule
   { name = "<hour-of-day> <integer> (as relative minutes)"
@@ -487,7 +510,7 @@ ruleDurationAgo = Rule
   { name = "<duration> ago"
   , pattern =
     [ dimension Duration
-    , regex "назад"
+    , regex "(тому )?назад"
     ]
   , prod = \case
       (Token Duration dd:_:_) ->
@@ -640,8 +663,6 @@ ruleWeek = Rule
        let match = Text.strip $ Text.toLower m
        period <- case match of
          "эта" -> interval TTime.Closed (cycleNth TG.Week 0) end
-         "rest of the" -> interval TTime.Open today end
-         -- no prefix, implicit 'the'
          "неделя" -> interval TTime.Open today end
          _ -> Nothing
        let l = case match of { "неделя" -> mkLatent; _ -> id; }
@@ -720,7 +741,7 @@ ruleMorning :: Rule
 ruleMorning = Rule
   { name = "morning"
   , pattern =
-    [ regex "утро|утром|утра"
+    [ regex "утром|утро|утра"
     ]
   , prod = \_ ->
       let from = hour False 3
@@ -733,7 +754,7 @@ ruleThisPartofday :: Rule
 ruleThisPartofday = Rule
   { name = "this <part-of-day>"
   , pattern =
-    [ regex "(в )?(это|эту|этот|этого|этому|эти)"
+    [ regex "(в )?(эту|этот|этого|этому|эти|это)"
     , Predicate isAPartOfDay
     ]
   , prod = \case
@@ -745,7 +766,7 @@ ruleThisCycle :: Rule
 ruleThisCycle = Rule
   { name = "this <cycle>"
   , pattern =
-    [ regex "(в )?(это|эту|этот|этого|этому|эти)"
+    [ regex "(в )?(эту|этот|этого|этому|эти)"
     , dimension TimeGrain
     ]
   , prod = \case
@@ -758,7 +779,7 @@ ruleThisTime :: Rule
 ruleThisTime = Rule
   { name = "this <time>"
   , pattern =
-    [ regex "(в )?(это|эту|этот|этого|этому|эти)"
+    [ regex "(в )?(эту|этот|этого|этому|эти|это)"
     , Predicate isOkWithThisNext
     ]
   , prod = \case
@@ -797,7 +818,7 @@ ruleNight :: Rule
 ruleNight = Rule
   { name = "night"
   , pattern =
-    [ regex "ночь|ночи|ночью"
+    [ regex "ночью|ночи|ночь"
     ]
   , prod = \_ ->
       let from = hour False 0
@@ -838,7 +859,7 @@ ruleHhmm :: Rule
 ruleHhmm = Rule
   { name = "hh:mm"
   , pattern =
-    [ regex "((?:[01]?\\d)|(?:2[0-3]))[:.ч]([0-5]\\d)(?:час(ов|а|у)?|ч)?"
+    [ regex "((?:[01]?\\d)|(?:2[0-3]))[:ч]([0-5]\\d)(?:час(ов|а|у)?|ч)?"
     ]
   , prod = \case
       (Token RegexMatch (GroupMatch (m1:m2:_)):_) -> do
@@ -1082,6 +1103,7 @@ rules =
   , ruleIntersectBy
   , ruleIntersectByOfFromS
   , ruleLastCycle
+  , ruleBeforeLastCycle
   , ruleLastCycle2
   , ruleLastCycleOfTime
   , ruleLastCycleOfTime2
@@ -1100,6 +1122,7 @@ rules =
   , ruleNextNCycle
   , ruleNight
   , ruleNoon
+  , ruleMidnight
   , ruleNthTimeAfterTime
   , ruleNthTimeOfTime
   , ruleNthTimeOfTime2
diff --git a/Duckling/TimeGrain/RU/Rules.hs b/Duckling/TimeGrain/RU/Rules.hs
index b2bad6f0f..d19f671f7 100644
--- a/Duckling/TimeGrain/RU/Rules.hs
+++ b/Duckling/TimeGrain/RU/Rules.hs
@@ -24,10 +24,10 @@ grains = [ ("second (grain) ", "сек(унд(а|у|ы)?)?",   Second)
          , ("minute (grain)" , "мин(ут(а|у|ы)?)?",    Minute)
          , ("hour (grain)"   , "ч(ас(а|ов)?)?",       Hour)
          , ("day (grain)"    , "день|дня|дней",       Day)
-         , ("week (grain)"   , "недел(ь|я|и|ю)?",     Week)
-         , ("month (grain)"  , "месяц(а|ев)?",        Month)
-         , ("quarter (grain)", "квартал(а)?",         Quarter)
-         , ("year (grain)"   , "года?|лет",           Year)
+         , ("week (grain)"   , "недел(ь|я|и|ю|е)?",   Week)
+         , ("month (grain)"  , "месяц(а|ев|е)?",      Month)
+         , ("quarter (grain)", "квартал(а|е)?",       Quarter)
+         , ("year (grain)"   , "год(а|у)?|лет",       Year)
          ]
 
 rules :: [Rule]

From a0c8a60975108c2a2913f0554bbb2eb73f60f07f Mon Sep 17 00:00:00 2001
From: Kantanat Wannapaka <stampkantanatpro@gmail.com>
Date: Mon, 10 Jan 2022 11:57:43 -0800
Subject: [PATCH 3/9] Fix image link, add link to license & linting (fix-cla)
 (#675)

Summary:
This is documentation changes.
 _Note: This version is misname cla error_

- [x] Fix image link from master <https://github.com/facebook/duckling/raw/master/logo.png> to <https://github.com/facebook/duckling/raw/main/logo.png>

- [x] Add language to code fences
- [x] Add link to LICENSE file

Pull Request resolved: https://github.com/facebook/duckling/pull/675

Reviewed By: patapizza

Differential Revision: D33477985

Pulled By: stroxler

fbshipit-source-id: 52e4ad2546bd5e0d5799d3a876063f78dd919b16
---
 README.md | 47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 31157b19b..18bd354a2 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,50 @@
-![Duckling Logo](https://github.com/facebook/duckling/raw/master/logo.png)
+![Duckling Logo](https://github.com/facebook/duckling/raw/main/logo.png)
 
 # Duckling [![Build Status](https://travis-ci.org/facebook/duckling.svg?branch=master)](https://travis-ci.org/facebook/duckling)
+
 Duckling is a Haskell library that parses text into structured data.
 
-```
+```bash
 "the first Tuesday of October"
 => {"value":"2017-10-03T00:00:00.000-07:00","grain":"day"}
 ```
 
 ## Requirements
+
 A Haskell environment is required. We recommend using
 [stack](https://haskell-lang.org/get-started).
 
 On Linux and MacOS you'll need to install PCRE development headers.
 On Linux, use your package manager to install them.
 On MacOS, the easiest way to install them is with [Homebrew](https://brew.sh/):
-```
+
+```bash
 brew install pcre
 ```
+
 If that doesn't help, try running `brew doctor` and fix
 the issues it finds.
 
 ## Quickstart
+
 To compile and run the binary:
+
+```bash
+stack build
+stack exec duckling-example-exe
 ```
-$ stack build
-$ stack exec duckling-example-exe
-```
+
 The first time you run it, it will download all required packages.
 
 This runs a basic HTTP server. Example request:
+
+```bash
+curl -XPOST http://0.0.0.0:8000/parse --data 'locale=en_GB&text=tomorrow at eight'
 ```
-$ curl -XPOST http://0.0.0.0:8000/parse --data 'locale=en_GB&text=tomorrow at eight'
-```
+
 In the example application, all dimensions are enabled by default. Provide the parameter `dims` to specify which ones you want. Examples:
-```
+
+```bash
 Identify credit card numbers only:
 $ curl -XPOST http://0.0.0.0:8000/parse --data 'locale=en_US&text="4111-1111-1111-1111"&dims="["credit-card-number"]"'
 If you want multiple dimensions, comma-separate them in the array:
@@ -46,6 +56,7 @@ project.
 If your backend doesn't run Haskell or if you don't want to spin your own Duckling server, you can directly use [wit.ai](https://wit.ai)'s built-in entities.
 
 ## Supported dimensions
+
 Duckling supports many languages, but most don't support all dimensions yet
 (**we need your help!**).
 Please look into [this directory](https://github.com/facebook/duckling/blob/master/Duckling/Dimensions) for language-specific support.
@@ -69,9 +80,11 @@ Please look into [this directory](https://github.com/facebook/duckling/blob/mast
 [Custom dimensions](https://github.com/facebook/duckling/blob/master/exe/CustomDimensionExample.hs) are also supported.
 
 ## Extending Duckling
+
 To regenerate the classifiers and run the test suite:
-```
-$ stack build :duckling-regen-exe && stack exec duckling-regen-exe && stack test
+
+```bash
+stack build :duckling-regen-exe && stack exec duckling-regen-exe && stack test
 ```
 
 It's important to regenerate the classifiers after updating the code and before
@@ -79,17 +92,23 @@ running the test suite.
 
 To extend Duckling's support for a dimension in a given language, typically 4
 files need to be updated:
+
 * `Duckling/<Dimension>/<Lang>/Rules.hs`
+
 * `Duckling/<Dimension>/<Lang>/Corpus.hs`
+
 * `Duckling/Dimensions/<Lang>.hs` (if not already present in `Duckling/Dimensions/Common.hs`)
+
 * `Duckling/Rules/<Lang>.hs`
 
 To add a new language:
+
 * Make sure that the language code used follows the [ISO-639-1 standard](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
 * The first dimension to implement is `Numeral`.
 * Follow [this example](https://github.com/facebook/duckling/commit/24d3f199768be970149412c95b1c1bf5d76f8240).
 
 To add a new locale:
+
 * There should be a need for diverging rules between the locale and the language.
 * Make sure that the locale code is a valid [ISO3166 alpha2 country code](https://www.iso.org/obp/ui/#search/code/).
 * Follow [this example](https://github.com/facebook/duckling/commit/1ab5f447d2635fe6d48887a501d333a52adff5b9).
@@ -105,7 +124,8 @@ shouldn't) parse. The reference time for the corpus is Tuesday Feb 12, 2013 at
 4:30am.
 
 `Duckling.Debug` provides a few debugging tools:
-```
+
+```bash
 $ stack repl --no-load
 > :l Duckling.Debug
 > debug (makeLocale EN $ Just US) "in two minutes" [Seal Time]
@@ -120,4 +140,5 @@ in|within|after <duration> (in two minutes)
 ```
 
 ## License
-Duckling is BSD-licensed.
+
+Duckling is [BSD-licensed](LICENSE).

From 03c6197283943c595608bb977a88a07c9e997006 Mon Sep 17 00:00:00 2001
From: Julien Odent <jodent@fb.com>
Date: Tue, 1 Feb 2022 12:36:25 -0800
Subject: [PATCH 4/9] Time: Don't accept negative years

Summary:
In theory, years can be negative. In practice, this is rarely seen and when it is, it's usually with the B.C. postfix.
Updating `ruleYearLatent` to not accept negative years for all languages.

Reviewed By: codyohl

Differential Revision: D33895871

fbshipit-source-id: 818000104da825aab91be7fa2a72704aa350a91a
---
 Duckling/Ranking/Classifiers/DA_XX.hs |  29 +-
 Duckling/Ranking/Classifiers/EL_XX.hs | 672 +++++++++---------
 Duckling/Ranking/Classifiers/EN_AU.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_BZ.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_CA.hs | 823 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_GB.hs | 823 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_IE.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_IN.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_JM.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_NZ.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_PH.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_TT.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_US.hs | 880 ++++++++++++------------
 Duckling/Ranking/Classifiers/EN_XX.hs | 808 +++++++++++-----------
 Duckling/Ranking/Classifiers/EN_ZA.hs | 798 +++++++++++-----------
 Duckling/Ranking/Classifiers/HU_XX.hs | 227 +++++--
 Duckling/Ranking/Classifiers/NB_XX.hs |  26 +-
 Duckling/Ranking/Classifiers/PT_XX.hs | 142 ++--
 Duckling/Ranking/Classifiers/RU_XX.hs | 942 ++++++++++++--------------
 Duckling/Ranking/Classifiers/TR_XX.hs |  97 ++-
 Duckling/Time/AR/Rules.hs             |   3 +-
 Duckling/Time/BG/Rules.hs             |   5 +-
 Duckling/Time/CA/Rules.hs             |   2 +-
 Duckling/Time/DA/Rules.hs             |   2 +-
 Duckling/Time/DE/Rules.hs             |   3 +-
 Duckling/Time/EL/Rules.hs             |   3 +-
 Duckling/Time/EN/Rules.hs             |   5 +-
 Duckling/Time/ES/Rules.hs             |   3 +-
 Duckling/Time/FR/Rules.hs             |   2 +-
 Duckling/Time/GA/Rules.hs             |   2 +-
 Duckling/Time/HR/Rules.hs             |   3 +-
 Duckling/Time/IT/Rules.hs             |  18 +-
 Duckling/Time/JA/Rules.hs             |   2 +-
 Duckling/Time/KO/Rules.hs             |   2 +-
 Duckling/Time/NB/Rules.hs             |   3 +-
 Duckling/Time/NL/Rules.hs             |   3 +-
 Duckling/Time/PL/Rules.hs             |   2 +-
 Duckling/Time/PT/Rules.hs             |   2 +-
 Duckling/Time/RO/Rules.hs             |   2 +-
 Duckling/Time/RU/Rules.hs             |   3 +-
 Duckling/Time/SV/Rules.hs             |   2 +-
 Duckling/Time/TR/Rules.hs             |   3 +-
 Duckling/Time/UK/Rules.hs             |   3 +-
 tests/Duckling/Time/EN/Tests.hs       |   1 +
 44 files changed, 6276 insertions(+), 6454 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/DA_XX.hs b/Duckling/Ranking/Classifiers/DA_XX.hs
index 4ae6c932f..32a69377d 100644
--- a/Duckling/Ranking/Classifiers/DA_XX.hs
+++ b/Duckling/Ranking/Classifiers/DA_XX.hs
@@ -64,23 +64,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.6931471805599453, unseen = -2.772588722239781,
+                     ClassData{prior = 0.0, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.0986122886681098),
-                                    ("tomorrowevening", -2.0149030205422647),
-                                    ("tomorrowlunch", -2.0149030205422647),
-                                    ("yesterdayevening", -2.0149030205422647),
-                                    ("Mondaymorning", -2.0149030205422647)],
+                                   [("dayhour", -0.9555114450274363),
+                                    ("tomorrowevening", -1.8718021769015913),
+                                    ("tomorrowlunch", -1.8718021769015913),
+                                    ("yesterdayevening", -1.8718021769015913),
+                                    ("Mondaymorning", -1.8718021769015913)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.6931471805599453, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("yearhour", -1.0986122886681098),
-                                    ("year (latent)in|during the <part-of-day>",
-                                     -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444,
@@ -535,12 +530,12 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -3.295836866004329,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.42488319396526597),
-                                    ("integer (0..19)", -1.0608719606852628)],
-                               n = 24}}),
+                                   [("integer (numeric)", -0.5260930958967791),
+                                    ("integer (0..19)", -0.8938178760220964)],
+                               n = 20}}),
        ("Monday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
diff --git a/Duckling/Ranking/Classifiers/EL_XX.hs b/Duckling/Ranking/Classifiers/EL_XX.hs
index aff6336d0..68f7bbfb6 100644
--- a/Duckling/Ranking/Classifiers/EL_XX.hs
+++ b/Duckling/Ranking/Classifiers/EL_XX.hs
@@ -559,347 +559,345 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4037091814058995, unseen = -6.860663671448286,
+                     ClassData{prior = -0.4019501660007199, unseen = -6.859614903654202,
                                likelihoods =
                                  HashMap.fromList
-                                   [("tuesdaySeptember", -5.250176991220102),
+                                   [("tuesdaySeptember", -5.249127122357264),
                                     ("Father's Dayabsorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("last <cycle> <time>'s'absorption of article before time",
-                                     -5.473320542534312),
-                                    ("hourday", -4.2946655461926655),
-                                    ("dayhour", -2.359805233323937),
-                                    ("daymonth", -3.815092465930779),
-                                    ("monthyear", -3.768572450295886),
+                                     -5.472270673671475),
+                                    ("hourday", -4.293615677329829),
+                                    ("dayhour", -2.3587553644611003),
+                                    ("daymonth", -3.8140425970679424),
+                                    ("monthyear", -3.7675225814330493),
                                     ("<time-of-day> am|pmabsorption of article before time",
-                                     -4.0264015595979865),
-                                    ("tuesdaythis <cycle>", -6.166467723094256),
+                                     -4.02535169073515),
+                                    ("tuesdaythis <cycle>", -6.16541785423142),
                                     ("last <day-of-week> of <time>absorption of article before time",
-                                     -6.166467723094256),
-                                    ("wednesdayintersect", -5.067855434426147),
+                                     -6.16541785423142),
+                                    ("wednesdayintersect", -5.06680556556331),
                                     ("absorption of article before timeabsorption of , after named day",
-                                     -6.166467723094256),
-                                    ("houryear", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("houryear", -6.16541785423142),
                                     ("absorption of article before timeat <time-of-day>",
-                                     -5.473320542534312),
+                                     -5.472270673671475),
                                     ("absorption of article before time<day-of-month> (ordinal or number) <named-month>",
-                                     -5.250176991220102),
+                                     -5.249127122357264),
                                     ("absorption of article before time<time> <part-of-day>",
-                                     -5.473320542534312),
+                                     -5.472270673671475),
                                     ("Octoberabsorption of article before time",
-                                     -5.473320542534312),
+                                     -5.472270673671475),
                                     ("intersect<day-of-month> (ordinal or number) <named-month>",
-                                     -4.2946655461926655),
-                                    ("intersect by 'of', 'from', 'syear", -6.166467723094256),
-                                    ("<time-of-day> am|pmintersect", -4.662390326317983),
-                                    ("intersectat <time-of-day>", -5.761002614986093),
+                                     -4.293615677329829),
+                                    ("intersect by 'of', 'from', 'syear", -6.16541785423142),
+                                    ("<time-of-day> am|pmintersect", -4.661340457455146),
+                                    ("intersectat <time-of-day>", -5.759952746123256),
                                     ("thursday<day-of-month> ( ordinal) <named-month> year",
-                                     -6.166467723094256),
-                                    ("saturday<time-of-day> am|pm", -5.761002614986093),
-                                    ("saturdayat <time-of-day>", -5.761002614986093),
-                                    ("after tomorrowat <time-of-day>", -6.166467723094256),
-                                    ("intersect<time-of-day> am|pm", -6.166467723094256),
-                                    ("<part-of-day> of <time>February", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("saturday<time-of-day> am|pm", -5.759952746123256),
+                                    ("saturdayat <time-of-day>", -5.759952746123256),
+                                    ("after tomorrowat <time-of-day>", -6.16541785423142),
+                                    ("intersect<time-of-day> am|pm", -6.16541785423142),
+                                    ("<part-of-day> of <time>February", -6.16541785423142),
                                     ("absorption of article before timeOctober",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("<time-of-day>  o'clockabsorption of article before time",
-                                     -6.166467723094256),
-                                    ("after tomorrow<time-of-day> am|pm", -5.761002614986093),
+                                     -6.16541785423142),
+                                    ("after tomorrow<time-of-day> am|pm", -5.759952746123256),
                                     ("wednesdayabsorption of article before time",
-                                     -4.662390326317983),
-                                    ("Marchabsorption of article before time", -6.166467723094256),
-                                    ("wednesdayat <time-of-day>", -5.761002614986093),
-                                    ("intersect by ','<time-of-day> am|pm", -5.250176991220102),
-                                    ("thursdayhh(:mm) - <time-of-day> am|pm", -6.166467723094256),
-                                    ("<time-of-day> am|pmintersect by ','", -5.250176991220102),
+                                     -4.661340457455146),
+                                    ("Marchabsorption of article before time", -6.16541785423142),
+                                    ("wednesdayat <time-of-day>", -5.759952746123256),
+                                    ("intersect by ','<time-of-day> am|pm", -5.249127122357264),
+                                    ("thursdayhh(:mm) - <time-of-day> am|pm", -6.16541785423142),
+                                    ("<time-of-day> am|pmintersect by ','", -5.249127122357264),
                                     ("absorption of article before timeLast year",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("absorption of article before timeintersect",
-                                     -5.250176991220102),
-                                    ("wednesday<time> <part-of-day>", -5.250176991220102),
-                                    ("hourmonth", -6.166467723094256),
-                                    ("todayat <time-of-day>", -6.166467723094256),
+                                     -5.249127122357264),
+                                    ("wednesday<time> <part-of-day>", -5.249127122357264),
+                                    ("hourmonth", -6.16541785423142),
+                                    ("todayat <time-of-day>", -6.16541785423142),
                                     ("absorption of article before timeabsorption of article before time",
-                                     -3.563778037649873),
-                                    ("thursday<time> timezone", -4.913704754598889),
+                                     -3.5627281687870362),
+                                    ("thursday<time> timezone", -4.912654885736052),
                                     ("yesterdayabsorption of article before time",
-                                     -6.166467723094256),
-                                    ("dayday", -3.60151836563272),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.761002614986093),
-                                    ("tonightat <time-of-day>", -5.761002614986093),
+                                     -6.16541785423142),
+                                    ("dayday", -3.6004684967698832),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.759952746123256),
+                                    ("tonightat <time-of-day>", -5.759952746123256),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.250176991220102),
-                                    ("today<time-of-day> am|pm", -5.761002614986093),
-                                    ("at <time-of-day><time> <part-of-day>", -5.473320542534312),
+                                     -5.249127122357264),
+                                    ("today<time-of-day> am|pm", -5.759952746123256),
+                                    ("at <time-of-day><time> <part-of-day>", -5.472270673671475),
                                     ("absorption of , after named day<day-of-month> (ordinal or number) <named-month>",
-                                     -4.220557574038944),
-                                    ("hourhour", -2.852281718421731),
+                                     -4.219507705176107),
+                                    ("hourhour", -2.851231849558894),
                                     ("<time-of-day> - <time-of-day> (interval)absorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("halloween dayabsorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("<datetime> - <datetime> (interval)absorption of article before time",
-                                     -5.761002614986093),
-                                    ("dayyear", -2.9475918982260563),
+                                     -5.759952746123256),
+                                    ("dayyear", -2.9465420293632194),
                                     ("thursday<day-of-month> (ordinal or number) <named-month>",
-                                     -6.166467723094256),
-                                    ("last weekend of <named-month>year", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("last weekend of <named-month>year", -6.16541785423142),
                                     ("<time-of-day>  o'clockin|during the <part-of-day>",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("tuesdayabsorption of article before time",
-                                     -4.662390326317983),
+                                     -4.661340457455146),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -6.166467723094256),
-                                    ("wednesday<time-of-day> am|pm (verbose)", -5.761002614986093),
-                                    ("before yesterday<time-of-day> am|pm", -5.761002614986093),
-                                    ("wednesdaythis <cycle>", -6.166467723094256),
-                                    ("todayin|during the <part-of-day>", -6.166467723094256),
-                                    ("<time-of-day> am|pmtomorrow", -5.250176991220102),
-                                    ("thursdayhh:mm", -6.166467723094256),
-                                    ("minutehour", -4.461719630855832),
-                                    ("before yesterdayat <time-of-day>", -5.761002614986093),
-                                    ("tonightin|during the <part-of-day>", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("wednesday<time-of-day> am|pm (verbose)", -5.759952746123256),
+                                    ("before yesterday<time-of-day> am|pm", -5.759952746123256),
+                                    ("wednesdaythis <cycle>", -6.16541785423142),
+                                    ("todayin|during the <part-of-day>", -6.16541785423142),
+                                    ("<time-of-day> am|pmtomorrow", -5.249127122357264),
+                                    ("thursdayhh:mm", -6.16541785423142),
+                                    ("minutehour", -4.460669761992995),
+                                    ("before yesterdayat <time-of-day>", -5.759952746123256),
+                                    ("tonightin|during the <part-of-day>", -6.16541785423142),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.250176991220102),
-                                    ("thursdayintersect", -6.166467723094256),
+                                     -5.249127122357264),
+                                    ("thursdayintersect", -6.16541785423142),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.250176991220102),
-                                    ("Aprilyear", -5.761002614986093),
+                                     -5.249127122357264),
+                                    ("Aprilyear", -5.759952746123256),
                                     ("absorption of article before timetomorrow",
-                                     -5.473320542534312),
+                                     -5.472270673671475),
                                     ("absorption of article before timehh(:mm) - <time-of-day> am|pm",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("absorption of article before timein|during the <part-of-day>",
-                                     -5.250176991220102),
-                                    ("yesterdayin|during the <part-of-day>", -6.166467723094256),
+                                     -5.249127122357264),
+                                    ("yesterdayin|during the <part-of-day>", -6.16541785423142),
                                     ("before yesterdayabsorption of article before time",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("this <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.166467723094256),
-                                    ("tuesday<time> <part-of-day>", -5.250176991220102),
+                                     -6.16541785423142),
+                                    ("tuesday<time> <part-of-day>", -5.249127122357264),
                                     ("absorption of article before timeFebruary",
-                                     -5.761002614986093),
-                                    ("weekmonth", -5.250176991220102),
-                                    ("tuesdayat <time-of-day>", -5.761002614986093),
-                                    ("mondaythis <cycle>", -6.166467723094256),
-                                    ("tomorrowintersect", -5.250176991220102),
-                                    ("intersectin|during the <part-of-day>", -4.913704754598889),
+                                     -5.759952746123256),
+                                    ("weekmonth", -5.249127122357264),
+                                    ("tuesdayat <time-of-day>", -5.759952746123256),
+                                    ("mondaythis <cycle>", -6.16541785423142),
+                                    ("tomorrowintersect", -5.249127122357264),
+                                    ("intersectin|during the <part-of-day>", -4.912654885736052),
                                     ("<time> <part-of-day>absorption of article before time",
-                                     -5.761002614986093),
-                                    ("the <cycle> of <time>October", -5.761002614986093),
+                                     -5.759952746123256),
+                                    ("the <cycle> of <time>October", -5.759952746123256),
                                     ("revolution dayabsorption of article before time",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("thursday<datetime> - <datetime> (interval)",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("Septemberabsorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("absorption of article before time<time-of-day> am|pm",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("tonightabsorption of article before time",
-                                     -5.473320542534312),
-                                    ("todayabsorption of article before time", -5.761002614986093),
+                                     -5.472270673671475),
+                                    ("todayabsorption of article before time", -5.759952746123256),
                                     ("at <time-of-day>absorption of article before time",
-                                     -4.662390326317983),
+                                     -4.661340457455146),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.761002614986093),
-                                    ("absorption of article before timeyear", -6.166467723094256),
-                                    ("tuesday<time-of-day> am|pm (verbose)", -5.761002614986093),
-                                    ("revolution dayLast year", -5.761002614986093),
-                                    ("at <time-of-day>intersect", -5.250176991220102),
+                                     -5.759952746123256),
+                                    ("absorption of article before timeyear", -6.16541785423142),
+                                    ("tuesday<time-of-day> am|pm (verbose)", -5.759952746123256),
+                                    ("revolution dayLast year", -5.759952746123256),
+                                    ("at <time-of-day>intersect", -5.249127122357264),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("absorption of article before timeintersect by ','",
-                                     -6.166467723094256),
-                                    ("dayminute", -3.815092465930779),
-                                    ("intersectyear", -5.067855434426147),
-                                    ("hh:mmabsorption of article before time", -5.473320542534312),
+                                     -6.16541785423142),
+                                    ("dayminute", -3.8140425970679424),
+                                    ("intersectyear", -5.06680556556331),
+                                    ("hh:mmabsorption of article before time", -5.472270673671475),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.166467723094256),
-                                    ("minuteday", -2.685227633758565),
-                                    ("absorption of , after named dayintersect",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("minuteday", -2.684177764895728),
+                                    ("absorption of , after named dayintersect", -6.16541785423142),
                                     ("the <cycle> of <time>absorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("<ordinal> <cycle> of <time>absorption of article before time",
-                                     -6.166467723094256),
-                                    ("at <time-of-day>intersect by ','", -6.166467723094256),
-                                    ("Octoberyear", -4.913704754598889),
+                                     -6.16541785423142),
+                                    ("at <time-of-day>intersect by ','", -6.16541785423142),
+                                    ("Octoberyear", -4.912654885736052),
                                     ("absorption of , after named dayintersect by ','",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("this <cycle>hh(:mm) - <time-of-day> am|pm",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("intersectabsorption of article before time",
-                                     -4.557029810660157),
+                                     -4.55597994179732),
                                     ("after tomorrowabsorption of article before time",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("saturdayabsorption of article before time",
-                                     -5.761002614986093),
-                                    ("tuesdaythe <day-of-month> (non ordinal)", -6.166467723094256),
+                                     -5.759952746123256),
+                                    ("tuesdaythe <day-of-month> (non ordinal)", -6.16541785423142),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.166467723094256),
-                                    ("tomorrowin|during the <part-of-day>", -5.067855434426147),
+                                     -6.16541785423142),
+                                    ("tomorrowin|during the <part-of-day>", -5.06680556556331),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -3.9151759244877615),
-                                    ("year<time-of-day> am|pm", -6.166467723094256),
-                                    ("Septemberyear", -5.250176991220102),
+                                     -3.914126055624925),
+                                    ("year<time-of-day> am|pm", -6.16541785423142),
+                                    ("Septemberyear", -5.249127122357264),
                                     ("christmasabsorption of article before time",
-                                     -6.166467723094256),
-                                    ("dayweek", -5.067855434426147),
-                                    ("weekyear", -5.250176991220102),
-                                    ("hh:mmin|during the <part-of-day>", -5.473320542534312),
+                                     -6.16541785423142),
+                                    ("dayweek", -5.06680556556331),
+                                    ("weekyear", -5.249127122357264),
+                                    ("hh:mmin|during the <part-of-day>", -5.472270673671475),
                                     ("the <day-of-month> (non ordinal)absorption of article before time",
-                                     -5.761002614986093),
-                                    ("tomorrowat <time-of-day>", -6.166467723094256),
-                                    ("tuesdayintersect", -4.557029810660157),
+                                     -5.759952746123256),
+                                    ("tomorrowat <time-of-day>", -6.16541785423142),
+                                    ("tuesdayintersect", -4.55597994179732),
                                     ("tomorrowbetween <time-of-day> and <time-of-day> (interval)",
-                                     -6.166467723094256),
-                                    ("at <time-of-day>tomorrow", -5.473320542534312),
-                                    ("tomorrow<time-of-day> am|pm", -5.761002614986093),
+                                     -6.16541785423142),
+                                    ("at <time-of-day>tomorrow", -5.472270673671475),
+                                    ("tomorrow<time-of-day> am|pm", -5.759952746123256),
                                     ("last <cycle> of <time>absorption of article before time",
-                                     -5.761002614986093),
+                                     -5.759952746123256),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.166467723094256),
+                                     -6.16541785423142),
                                     ("in|during the <part-of-day>absorption of article before time",
-                                     -6.166467723094256),
-                                    ("intersectFebruary", -6.166467723094256),
-                                    ("<datetime> - <datetime> (interval)July", -6.166467723094256),
+                                     -6.16541785423142),
+                                    ("intersectFebruary", -6.16541785423142),
+                                    ("<datetime> - <datetime> (interval)July", -6.16541785423142),
                                     ("tomorrowabsorption of article before time",
-                                     -4.913704754598889),
-                                    ("yearminute", -6.166467723094256),
+                                     -4.912654885736052),
+                                    ("yearminute", -6.16541785423142),
                                     ("Mother's Dayabsorption of article before time",
-                                     -6.166467723094256)],
+                                     -6.16541785423142)],
                                n = 380},
                    koData =
-                     ClassData{prior = -1.1021334190666885, unseen = -6.349138991379798,
+                     ClassData{prior = -1.1056794558912022, unseen = -6.343880434126331,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -5.654242029096065),
+                                   [("hourday", -5.648974238161206),
                                     ("thursdayabsorption of article before time",
-                                     -5.2487769209879005),
-                                    ("dayhour", -3.574800487416229),
-                                    ("daymonth", -2.563199575737749),
-                                    ("hourquarter", -5.654242029096065),
-                                    ("absorption of article before timedd/mm", -5.654242029096065),
-                                    ("monthyear", -3.302866771932587),
+                                     -5.243509130053042),
+                                    ("dayhour", -3.56953269648137), ("daymonth", -2.55793178480289),
+                                    ("hourquarter", -5.648974238161206),
+                                    ("absorption of article before timedd/mm", -5.648974238161206),
+                                    ("monthyear", -3.297598980997728),
                                     ("absorption of article before timeDecember",
-                                     -5.654242029096065),
-                                    ("tuesdayFebruary", -5.654242029096065),
-                                    ("wednesdayintersect", -5.654242029096065),
-                                    ("intersecthh:mm", -5.654242029096065),
-                                    ("hh:mmuntil <time>", -4.96109484853612),
-                                    ("houryear", -5.2487769209879005),
-                                    ("hournograin", -4.401479060600697),
-                                    ("intersect by 'of', 'from', 'syear", -4.73795129722191),
-                                    ("absorption of article before timeJuly", -5.2487769209879005),
-                                    ("thursdayafter <time-of-day>", -4.555629740427955),
-                                    ("Marchyear", -4.1501646323197905),
-                                    ("after tomorrowat <time-of-day>", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("tuesdayFebruary", -5.648974238161206),
+                                    ("wednesdayintersect", -5.648974238161206),
+                                    ("intersecthh:mm", -5.648974238161206),
+                                    ("hh:mmuntil <time>", -4.955827057601261),
+                                    ("houryear", -5.243509130053042),
+                                    ("hournograin", -4.396211269665838),
+                                    ("intersect by 'of', 'from', 'syear", -4.732683506287051),
+                                    ("absorption of article before timeJuly", -5.243509130053042),
+                                    ("thursdayafter <time-of-day>", -4.550361949493096),
+                                    ("Marchyear", -4.144896841384932),
+                                    ("after tomorrowat <time-of-day>", -5.648974238161206),
                                     ("absorption of article before timeOctober",
-                                     -5.2487769209879005),
-                                    ("<time-of-day> am|pmuntil <time>", -5.2487769209879005),
+                                     -5.243509130053042),
+                                    ("<time-of-day> am|pmuntil <time>", -5.243509130053042),
                                     ("wednesdayabsorption of article before time",
-                                     -5.2487769209879005),
-                                    ("intersect by ','<time-of-day> am|pm", -5.654242029096065),
+                                     -5.243509130053042),
+                                    ("intersect by ','<time-of-day> am|pm", -5.648974238161206),
                                     ("absorption of article before timethe <cycle> of <time>",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("intersect by 'of', 'from', 'sabsorption of article before time",
-                                     -5.654242029096065),
-                                    ("intersect by ','hh:mm", -4.555629740427955),
-                                    ("mondayabsorption of article before time", -5.654242029096065),
-                                    ("hourmonth", -3.2563467562976944),
-                                    ("todayat <time-of-day>", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("intersect by ','hh:mm", -4.550361949493096),
+                                    ("mondayabsorption of article before time", -5.648974238161206),
+                                    ("hourmonth", -3.2510789653628356),
+                                    ("todayat <time-of-day>", -5.648974238161206),
                                     ("absorption of article before timeabsorption of article before time",
-                                     -3.6393390085538),
-                                    ("dayday", -3.351656936102019),
-                                    ("dayquarter", -5.654242029096065),
+                                     -3.703064089105893),
+                                    ("dayday", -3.3463891451671604),
+                                    ("dayquarter", -5.648974238161206),
                                     ("<time-of-day> - <time-of-day> (interval)absorption of article before time",
-                                     -5.654242029096065),
-                                    ("thursdayat <time-of-day>", -5.2487769209879005),
-                                    ("week-endintersect", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("thursdayat <time-of-day>", -5.243509130053042),
+                                    ("week-endintersect", -5.648974238161206),
                                     ("<datetime> - <datetime> (interval)absorption of article before time",
-                                     -5.2487769209879005),
-                                    ("dayyear", -3.1285133847878095),
-                                    ("thursdaydd/mm", -5.654242029096065),
-                                    ("tuesdayabsorption of article before time", -4.96109484853612),
-                                    ("tuesdayintersect by 'of', 'from', 's", -5.2487769209879005),
-                                    ("monthminute", -5.2487769209879005),
-                                    ("<time-of-day> am|pmtomorrow", -5.654242029096065),
-                                    ("tuesdayMarch", -4.73795129722191),
-                                    ("thursdayhh:mm", -5.2487769209879005),
-                                    ("after <time-of-day>December", -5.654242029096065),
-                                    ("for <duration> from <time>December", -5.654242029096065),
-                                    ("thursdayintersect", -5.2487769209879005),
-                                    ("Aprilyear", -4.555629740427955),
-                                    ("sundayintersect by 'of', 'from', 's", -5.654242029096065),
-                                    ("tuesdayJanuary", -5.654242029096065),
+                                     -5.243509130053042),
+                                    ("dayyear", -3.1232455938529506),
+                                    ("thursdaydd/mm", -5.648974238161206),
+                                    ("tuesdayabsorption of article before time",
+                                     -4.955827057601261),
+                                    ("tuesdayintersect by 'of', 'from', 's", -5.243509130053042),
+                                    ("monthminute", -5.243509130053042),
+                                    ("<time-of-day> am|pmtomorrow", -5.648974238161206),
+                                    ("tuesdayMarch", -4.732683506287051),
+                                    ("thursdayhh:mm", -5.243509130053042),
+                                    ("after <time-of-day>December", -5.648974238161206),
+                                    ("for <duration> from <time>December", -5.648974238161206),
+                                    ("thursdayintersect", -5.243509130053042),
+                                    ("Aprilyear", -4.550361949493096),
+                                    ("sundayintersect by 'of', 'from', 's", -5.648974238161206),
+                                    ("tuesdayJanuary", -5.648974238161206),
                                     ("absorption of article before timehh(:mm) - <time-of-day> am|pm",
-                                     -5.654242029096065),
-                                    ("tuesdayOctober", -5.2487769209879005),
+                                     -5.648974238161206),
+                                    ("tuesdayOctober", -5.243509130053042),
                                     ("<day-of-month> (ordinal or number) of <named-month>year",
-                                     -4.96109484853612),
+                                     -4.955827057601261),
                                     ("absorption of article before timeFebruary",
-                                     -5.2487769209879005),
+                                     -5.243509130053042),
                                     ("tuesday<day-of-month> (ordinal or number) <named-month>",
-                                     -5.654242029096065),
-                                    ("weekmonth", -4.73795129722191),
-                                    ("minutenograin", -4.96109484853612),
-                                    ("sundayabsorption of article before time", -4.96109484853612),
-                                    ("todayabsorption of article before time", -5.654242029096065),
-                                    ("yearmonth", -5.654242029096065),
-                                    ("absorption of article before timeyear", -4.555629740427955),
-                                    ("dayminute", -4.044804116661965),
-                                    ("intersectyear", -3.8624825598680097),
-                                    ("hh:mmabsorption of article before time", -5.2487769209879005),
-                                    ("thursdayApril", -5.654242029096065),
-                                    ("minuteday", -4.73795129722191),
+                                     -5.648974238161206),
+                                    ("weekmonth", -4.732683506287051),
+                                    ("minutenograin", -4.955827057601261),
+                                    ("sundayabsorption of article before time", -4.955827057601261),
+                                    ("todayabsorption of article before time", -5.648974238161206),
+                                    ("absorption of article before timeyear", -4.550361949493096),
+                                    ("dayminute", -4.039536325727106),
+                                    ("intersectyear", -3.857214768933151),
+                                    ("hh:mmabsorption of article before time", -5.243509130053042),
+                                    ("thursdayApril", -5.648974238161206),
+                                    ("minuteday", -4.732683506287051),
                                     ("absorption of , after named dayintersect",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("the <cycle> of <time>absorption of article before time",
-                                     -4.96109484853612),
-                                    ("tuesdayApril", -5.2487769209879005),
-                                    ("Octoberyear", -5.654242029096065),
+                                     -4.955827057601261),
+                                    ("tuesdayApril", -5.243509130053042),
+                                    ("Octoberyear", -5.648974238161206),
                                     ("absorption of , after named dayintersect by ','",
-                                     -5.654242029096065),
-                                    ("yearhh:mm", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("yearhh:mm", -5.648974238161206),
                                     ("this <cycle>hh(:mm) - <time-of-day> am|pm",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("intersectabsorption of article before time",
-                                     -4.555629740427955),
+                                     -4.550361949493096),
                                     ("tuesday<day-of-month> (ordinal or number) of <named-month>",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("after tomorrowabsorption of article before time",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("absorption of article before timeuntil <time>",
-                                     -4.267947667976174),
+                                     -4.2626798770413155),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -4.96109484853612),
-                                    ("<duration> after <time>December", -5.654242029096065),
-                                    ("intersectintersect", -5.654242029096065),
-                                    ("tuesdaytuesday", -5.654242029096065),
+                                     -4.955827057601261),
+                                    ("<duration> after <time>December", -5.648974238161206),
+                                    ("intersectintersect", -5.648974238161206),
+                                    ("tuesdaytuesday", -5.648974238161206),
                                     ("the <day-of-month> (non ordinal)absorption of article before time",
-                                     -3.94949393685764),
-                                    ("at <time-of-day>February", -5.654242029096065),
+                                     -3.944226145922781),
+                                    ("at <time-of-day>February", -5.648974238161206),
                                     ("week-endabsorption of article before time",
-                                     -4.73795129722191),
-                                    ("thursdayOctober", -5.2487769209879005),
-                                    ("tomorrowat <time-of-day>", -5.654242029096065),
-                                    ("tuesdayintersect", -3.8624825598680097),
-                                    ("daynograin", -3.7824398521944733),
+                                     -4.732683506287051),
+                                    ("thursdayOctober", -5.243509130053042),
+                                    ("tomorrowat <time-of-day>", -5.648974238161206),
+                                    ("tuesdayintersect", -3.857214768933151),
+                                    ("daynograin", -3.7771720612596145),
                                     ("tomorrowbetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.654242029096065),
-                                    ("tuesdayMay", -5.654242029096065),
+                                     -5.648974238161206),
+                                    ("tuesdayMay", -5.648974238161206),
                                     ("after <time-of-day>absorption of article before time",
-                                     -5.654242029096065),
+                                     -5.648974238161206),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.2487769209879005),
-                                    ("sundayintersect", -5.654242029096065),
-                                    ("thursdayintersect by 'of', 'from', 's", -5.654242029096065),
+                                     -5.243509130053042),
+                                    ("sundayintersect", -5.648974238161206),
+                                    ("thursdayintersect by 'of', 'from', 's", -5.648974238161206),
                                     ("tomorrowabsorption of article before time",
-                                     -5.654242029096065),
-                                    ("yearminute", -5.654242029096065)],
-                               n = 189}}),
+                                     -5.648974238161206),
+                                    ("yearminute", -5.648974238161206)],
+                               n = 188}}),
        ("quarter to|past <integer> (hour-of-day)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
@@ -1082,117 +1080,113 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("integer (numeric)", -0.6931471805599453),
-                                    ("negative numbers", -0.6931471805599453)],
-                               n = 2}}),
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
+                               n = 1}}),
        ("absorption of article before time",
         Classifier{okData =
-                     ClassData{prior = -0.2325627732307014, unseen = -6.551080335043404,
+                     ClassData{prior = -0.23005964301258283, unseen = -6.54965074223381,
                                likelihoods =
                                  HashMap.fromList
-                                   [("midnight", -5.856503561673865),
-                                    ("last <cycle> <time>'s'", -3.9105934126185518),
-                                    ("week", -3.6592789843376456),
-                                    ("Father's Day", -5.4510384535657),
-                                    ("thursday", -5.4510384535657), ("fall", -5.4510384535657),
+                                   [("midnight", -5.855071922202427),
+                                    ("last <cycle> <time>'s'", -3.909161773147114),
+                                    ("week", -3.657847344866208),
+                                    ("Father's Day", -5.449606814094262),
+                                    ("thursday", -5.449606814094262), ("fall", -5.449606814094262),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.470209200553974),
-                                    ("<time> <part-of-day>", -4.247065649239764),
-                                    ("absorption of , after named day", -5.4510384535657),
-                                    ("revolution day", -4.757891273005756),
-                                    ("October", -4.1517554694354395),
-                                    ("wednesday", -5.856503561673865), ("July", -5.4510384535657),
-                                    ("<ordinal> quarter", -5.856503561673865),
-                                    ("saturday", -5.163356381113919),
-                                    ("Last year", -5.163356381113919),
-                                    ("intersect", -2.8119811239504418),
-                                    ("half after|past <integer> (hour-of-day)", -5.856503561673865),
-                                    ("<ordinal> <cycle> of <time>", -5.856503561673865),
-                                    ("next <cycle>", -4.470209200553974),
-                                    ("the <cycle> of <time>", -4.603740593178497),
-                                    ("<ordinal> quarter <year>", -5.856503561673865),
-                                    ("second", -4.94021282979971), ("monday", -5.4510384535657),
-                                    ("valentine's day", -5.4510384535657),
+                                     -4.468777561082536),
+                                    ("<time> <part-of-day>", -4.2456340097683265),
+                                    ("absorption of , after named day", -5.449606814094262),
+                                    ("revolution day", -4.756459633534318),
+                                    ("October", -4.150323829964002),
+                                    ("wednesday", -5.855071922202427), ("July", -5.449606814094262),
+                                    ("<ordinal> quarter", -5.855071922202427),
+                                    ("saturday", -5.161924741642482),
+                                    ("Last year", -5.161924741642482),
+                                    ("intersect", -2.810549484479004),
+                                    ("half after|past <integer> (hour-of-day)", -5.855071922202427),
+                                    ("<ordinal> <cycle> of <time>", -5.855071922202427),
+                                    ("next <cycle>", -4.468777561082536),
+                                    ("the <cycle> of <time>", -4.602308953707059),
+                                    ("<ordinal> quarter <year>", -5.855071922202427),
+                                    ("second", -4.938781190328272), ("monday", -5.449606814094262),
+                                    ("valentine's day", -5.449606814094262),
                                     ("<day-of-month> (ordinal or number) of <named-month>",
-                                     -5.856503561673865),
-                                    ("this|last|next <cycle>", -4.247065649239764),
-                                    ("Mother's Day", -5.4510384535657),
-                                    ("friday", -5.4510384535657),
-                                    ("<time-of-day> am|pm (verbose)", -5.163356381113919),
-                                    ("<time> after next", -5.856503561673865),
-                                    ("day", -1.8862116481217432),
-                                    ("next <day-of-week>", -4.94021282979971),
-                                    ("afternoon", -4.1517554694354395),
-                                    ("February", -4.94021282979971),
-                                    ("quarter", -4.757891273005756),
-                                    ("this <cycle>", -5.856503561673865),
-                                    ("sunday", -5.856503561673865),
-                                    ("time-of-day (latent)", -2.9661318037777002),
-                                    ("year", -3.5539184686798193),
-                                    ("<time-of-day> am|pm", -3.4586082888754945),
-                                    ("<duration> after <time>", -5.163356381113919),
-                                    ("hh:mm", -4.757891273005756),
-                                    ("intersect by ','", -5.163356381113919),
-                                    ("intersect by 'of', 'from', 's", -3.9105934126185518),
-                                    ("last <time>", -4.470209200553974),
-                                    ("EOM|End of month", -5.856503561673865),
-                                    ("March", -4.603740593178497),
-                                    ("<day-of-month> (ordinal)", -4.470209200553974),
-                                    ("noon", -5.4510384535657), ("hour", -1.9444805562457188),
-                                    ("evening", -4.470209200553974), ("month", -2.938732829589586),
-                                    ("EOD|End of day", -5.856503561673865),
-                                    ("next <time>", -4.757891273005756),
-                                    ("christmas", -5.4510384535657),
-                                    ("next n <cycle>", -4.603740593178497),
-                                    ("tuesday", -5.163356381113919),
-                                    ("halloween day", -5.856503561673865),
-                                    ("winter", -5.856503561673865),
-                                    ("last n <cycle>", -4.757891273005756),
-                                    ("last <cycle> of <time>", -4.603740593178497),
-                                    ("minute", -3.05314318076733), ("week-end", -5.4510384535657),
-                                    ("summer", -5.856503561673865), ("August", -5.856503561673865)],
+                                     -5.855071922202427),
+                                    ("this|last|next <cycle>", -4.2456340097683265),
+                                    ("Mother's Day", -5.449606814094262),
+                                    ("friday", -5.449606814094262),
+                                    ("<time-of-day> am|pm (verbose)", -5.161924741642482),
+                                    ("<time> after next", -5.855071922202427),
+                                    ("day", -1.8847800086503053),
+                                    ("next <day-of-week>", -4.938781190328272),
+                                    ("afternoon", -4.150323829964002),
+                                    ("February", -4.938781190328272),
+                                    ("quarter", -4.756459633534318),
+                                    ("this <cycle>", -5.855071922202427),
+                                    ("sunday", -5.855071922202427),
+                                    ("time-of-day (latent)", -2.9647001643062625),
+                                    ("year", -3.5524868292083815),
+                                    ("<time-of-day> am|pm", -3.457176649404057),
+                                    ("<duration> after <time>", -5.161924741642482),
+                                    ("hh:mm", -4.756459633534318),
+                                    ("intersect by ','", -5.161924741642482),
+                                    ("intersect by 'of', 'from', 's", -3.909161773147114),
+                                    ("last <time>", -4.468777561082536),
+                                    ("EOM|End of month", -5.855071922202427),
+                                    ("March", -4.602308953707059),
+                                    ("<day-of-month> (ordinal)", -4.468777561082536),
+                                    ("noon", -5.449606814094262), ("hour", -1.9430489167742813),
+                                    ("evening", -4.468777561082536), ("month", -2.937301190118148),
+                                    ("EOD|End of day", -5.855071922202427),
+                                    ("next <time>", -4.756459633534318),
+                                    ("christmas", -5.449606814094262),
+                                    ("next n <cycle>", -4.602308953707059),
+                                    ("tuesday", -5.161924741642482),
+                                    ("halloween day", -5.855071922202427),
+                                    ("winter", -5.855071922202427),
+                                    ("last n <cycle>", -4.756459633534318),
+                                    ("last <cycle> of <time>", -4.602308953707059),
+                                    ("minute", -3.051711541295892),
+                                    ("week-end", -5.449606814094262),
+                                    ("summer", -5.855071922202427), ("August", -5.855071922202427)],
                                n = 317},
                    koData =
-                     ClassData{prior = -1.5726239393113841, unseen = -5.493061443340548,
+                     ClassData{prior = -1.5822421696256104, unseen = -5.480638923341991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.6971782569286313),
-                                    ("<duration> hence|ago", -4.795790545596741),
+                                   [("week", -3.6847040827034556),
+                                    ("<duration> hence|ago", -4.783316371371566),
                                     ("<named-month> <day-of-month> (ordinal or number)",
-                                     -4.795790545596741),
+                                     -4.783316371371566),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -3.186352633162641),
-                                    ("September", -4.795790545596741),
-                                    ("October", -4.390325437488577),
-                                    ("<ordinal> quarter", -4.795790545596741),
-                                    ("intersect", -3.186352633162641),
-                                    ("the <cycle> of <time>", -3.879499813722586),
-                                    ("year (latent)", -4.795790545596741),
-                                    ("April", -4.795790545596741),
-                                    ("this|last|next <cycle>", -4.795790545596741),
-                                    ("day", -2.230841188135204), ("afternoon", -4.795790545596741),
-                                    ("quarter", -4.102643365036796),
-                                    ("time-of-day (latent)", -2.4444152884332633),
-                                    ("year", -4.795790545596741), ("hh:mm", -4.795790545596741),
-                                    ("nograin", -3.291713148820467),
-                                    ("until <time>", -3.291713148820467),
-                                    ("intersect by 'of', 'from', 's", -4.795790545596741),
-                                    ("March", -4.390325437488577),
-                                    ("<day-of-month> (ordinal)", -3.004031076368686),
-                                    ("hour", -2.3978952727983707), ("month", -2.716349003916905),
-                                    ("last <cycle>", -4.102643365036796),
-                                    ("<datetime> - <datetime> (interval)", -4.795790545596741),
+                                     -3.173878458937465),
+                                    ("September", -4.783316371371566),
+                                    ("October", -4.377851263263401),
+                                    ("<ordinal> quarter", -4.783316371371566),
+                                    ("intersect", -3.173878458937465),
+                                    ("the <cycle> of <time>", -3.8670256394974105),
+                                    ("April", -4.783316371371566),
+                                    ("this|last|next <cycle>", -4.783316371371566),
+                                    ("day", -2.2183670139100284), ("afternoon", -4.783316371371566),
+                                    ("quarter", -4.09016919081162),
+                                    ("time-of-day (latent)", -2.4319411142080876),
+                                    ("hh:mm", -4.783316371371566), ("nograin", -3.2792389745952915),
+                                    ("until <time>", -3.2792389745952915),
+                                    ("intersect by 'of', 'from', 's", -4.783316371371566),
+                                    ("March", -4.377851263263401),
+                                    ("<day-of-month> (ordinal)", -2.99155690214351),
+                                    ("hour", -2.385421098573195), ("month", -2.7038748296917294),
+                                    ("last <cycle>", -4.09016919081162),
+                                    ("<datetime> - <datetime> (interval)", -4.783316371371566),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -4.390325437488577),
-                                    ("minute", -3.6971782569286313),
-                                    ("August", -4.390325437488577)],
-                               n = 83}}),
+                                     -4.377851263263401),
+                                    ("minute", -3.6847040827034556),
+                                    ("August", -4.377851263263401)],
+                               n = 82}}),
        ("dd/mm/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
diff --git a/Duckling/Ranking/Classifiers/EN_AU.hs b/Duckling/Ranking/Classifiers/EN_AU.hs
index 7fec8cc2d..c1758ea27 100644
--- a/Duckling/Ranking/Classifiers/EN_AU.hs
+++ b/Duckling/Ranking/Classifiers/EN_AU.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
-                                    ("Thursdaydd/mm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
+                                    ("Thursdaydd/mm", -6.07993319509559),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/EN_BZ.hs b/Duckling/Ranking/Classifiers/EN_BZ.hs
index 0f0535407..07ec654db 100644
--- a/Duckling/Ranking/Classifiers/EN_BZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_BZ.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
-                                    ("Thursdaydd/mm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
+                                    ("Thursdaydd/mm", -6.07993319509559),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/EN_CA.hs b/Duckling/Ranking/Classifiers/EN_CA.hs
index b17f8db5e..6b600071f 100644
--- a/Duckling/Ranking/Classifiers/EN_CA.hs
+++ b/Duckling/Ranking/Classifiers/EN_CA.hs
@@ -284,7 +284,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -305,44 +305,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -1013,479 +1013,465 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.47948237320027937, unseen = -7.21890970761906,
+                     ClassData{prior = -0.4434640740111233, unseen = -7.214504414151143,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.525029657843462),
-                                    ("Father's Dayyear (latent)", -6.525029657843462),
-                                    ("Karva Chauthyear (latent)", -6.525029657843462),
+                                   [("Navaratriyear (latent)", -6.520621127558696),
+                                    ("Father's Dayyear (latent)", -6.520621127558696),
+                                    ("Karva Chauthyear (latent)", -6.520621127558696),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.525029657843462),
-                                    ("Maha Shivaratriyear (latent)", -6.525029657843462),
-                                    ("Ramadanyear (latent)", -5.272266689348094),
+                                     -6.520621127558696),
+                                    ("Maha Shivaratriyear (latent)", -6.520621127558696),
+                                    ("Ramadanyear (latent)", -5.267858159063328),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.1387352967235715),
-                                    ("Bhai Doojyear (latent)", -6.525029657843462),
-                                    ("hourday", -4.510126637301197),
-                                    ("dayhour", -3.480507220120039),
+                                     -5.1343267664388055),
+                                    ("Bhai Doojyear (latent)", -6.520621127558696),
+                                    ("hourday", -4.505718107016431),
+                                    ("dayhour", -3.4760986898352733),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.1387352967235715),
-                                    ("Martin Luther King's Dayyear (latent)", -6.119564549735298),
-                                    ("Shemini Atzeretyear (latent)", -6.525029657843462),
-                                    ("daymonth", -4.510126637301197),
-                                    ("monthday", -6.119564549735298),
-                                    ("monthyear", -4.733270188615407),
-                                    ("Yom Ha'atzmautyear (latent)", -6.525029657843462),
-                                    ("Orthodox Good Fridayyear (latent)", -6.119564549735298),
-                                    ("Vijayadashamiyear (latent)", -6.525029657843462),
+                                     -5.1343267664388055),
+                                    ("Martin Luther King's Dayyear (latent)", -6.115156019450532),
+                                    ("Shemini Atzeretyear (latent)", -6.520621127558696),
+                                    ("daymonth", -4.505718107016431),
+                                    ("monthday", -6.115156019450532),
+                                    ("monthyear", -4.728861658330641),
+                                    ("Yom Ha'atzmautyear (latent)", -6.520621127558696),
+                                    ("Orthodox Good Fridayyear (latent)", -6.115156019450532),
+                                    ("Vijayadashamiyear (latent)", -6.520621127558696),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -6.119564549735298),
-                                    ("Thanksgiving Dayyear (latent)", -5.426417369175352),
-                                    ("Thai Pongalyear (latent)", -5.831882477283517),
-                                    ("Thiru Onamyear (latent)", -5.831882477283517),
-                                    ("hhhmmabsorption of , after named day", -6.525029657843462),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.525029657843462),
+                                     -6.115156019450532),
+                                    ("Thanksgiving Dayyear (latent)", -5.422008838890586),
+                                    ("Thai Pongalyear (latent)", -5.827473946998751),
+                                    ("Thiru Onamyear (latent)", -5.827473946998751),
+                                    ("hhhmmabsorption of , after named day", -6.520621127558696),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.520621127558696),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.608738925969307),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.525029657843462),
-                                    ("Krishna Janmashtamiyear (latent)", -6.119564549735298),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.525029657843462),
-                                    ("houryear", -5.608738925969307),
+                                     -5.604330395684541),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.520621127558696),
+                                    ("Krishna Janmashtamiyear (latent)", -6.115156019450532),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.520621127558696),
+                                    ("houryear", -5.604330395684541),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.525029657843462),
-                                    ("Christmas<time-of-day> am|pm", -6.525029657843462),
+                                     -6.520621127558696),
+                                    ("Christmas<time-of-day> am|pm", -6.520621127558696),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.525029657843462),
+                                     -6.520621127558696),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.831882477283517),
-                                    ("intersectin|during <named-month>|year", -6.525029657843462),
-                                    ("<time-of-day> am|pmintersect", -5.272266689348094),
-                                    ("Earth Houryear (latent)", -6.525029657843462),
-                                    ("Ganesh Chaturthiyear (latent)", -6.525029657843462),
-                                    ("Family Dayyear (latent)", -5.608738925969307),
-                                    ("Octoberyear (latent)", -5.020952261067188),
-                                    ("intersect<time-of-day> am|pm", -6.525029657843462),
-                                    ("Mattu Pongalyear (latent)", -6.525029657843462),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.525029657843462),
-                                    ("Shavuotyear (latent)", -6.525029657843462),
-                                    ("Parsi New Yearyear (latent)", -5.608738925969307),
+                                     -5.827473946998751),
+                                    ("intersectin|during <named-month>|year", -6.520621127558696),
+                                    ("<time-of-day> am|pmintersect", -5.267858159063328),
+                                    ("Earth Houryear (latent)", -6.520621127558696),
+                                    ("Ganesh Chaturthiyear (latent)", -6.520621127558696),
+                                    ("Family Dayyear (latent)", -5.604330395684541),
+                                    ("Octoberyear (latent)", -5.016543730782422),
+                                    ("intersect<time-of-day> am|pm", -6.520621127558696),
+                                    ("Mattu Pongalyear (latent)", -6.520621127558696),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.520621127558696),
+                                    ("Shavuotyear (latent)", -6.520621127558696),
+                                    ("Parsi New Yearyear (latent)", -5.604330395684541),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.525029657843462),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.525029657843462),
-                                    ("todayin|within|after <duration>", -6.525029657843462),
+                                     -6.520621127558696),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.520621127558696),
+                                    ("todayin|within|after <duration>", -6.520621127558696),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.119564549735298),
-                                    ("Marchyear (latent)", -6.525029657843462),
+                                     -6.115156019450532),
+                                    ("Marchyear (latent)", -6.520621127558696),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.119564549735298),
-                                    ("Sukkotyear (latent)", -6.119564549735298),
-                                    ("hhhmmintersect", -6.119564549735298),
+                                     -6.115156019450532),
+                                    ("Sukkotyear (latent)", -6.115156019450532),
+                                    ("hhhmmintersect", -6.115156019450532),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.119564549735298),
-                                    ("Clean Mondayyear (latent)", -6.119564549735298),
-                                    ("monthhour", -6.119564549735298),
+                                     -6.115156019450532),
+                                    ("Clean Mondayyear (latent)", -6.115156019450532),
+                                    ("monthhour", -6.115156019450532),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.608738925969307),
-                                    ("todayat <time-of-day>", -6.525029657843462),
-                                    ("Thursday<time> timezone", -4.127134385045092),
-                                    ("tonight<time-of-day> am|pm", -6.525029657843462),
-                                    ("time-of-day (latent)tonight", -6.119564549735298),
-                                    ("from|since|after <time>December", -6.525029657843462),
-                                    ("<time-of-day> am|pmon <day>", -4.510126637301197),
+                                     -5.604330395684541),
+                                    ("todayat <time-of-day>", -6.520621127558696),
+                                    ("Thursday<time> timezone", -4.122725854760326),
+                                    ("tonight<time-of-day> am|pm", -6.520621127558696),
+                                    ("time-of-day (latent)tonight", -6.115156019450532),
+                                    ("from|since|after <time>December", -6.520621127558696),
+                                    ("<time-of-day> am|pmon <day>", -4.505718107016431),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.525029657843462),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.119564549735298),
-                                    ("dayday", -3.7524409356036807),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.119564549735298),
-                                    ("mm/ddat <time-of-day>", -6.525029657843462),
-                                    ("tonightat <time-of-day>", -5.426417369175352),
+                                     -6.520621127558696),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.115156019450532),
+                                    ("dayday", -3.748032405318915),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.115156019450532),
+                                    ("mm/ddat <time-of-day>", -6.520621127558696),
+                                    ("tonightat <time-of-day>", -5.422008838890586),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.831882477283517),
+                                     -5.827473946998751),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.525029657843462),
-                                    ("today<time-of-day> am|pm", -6.525029657843462),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.119564549735298),
-                                    ("at <time-of-day><time> <part-of-day>", -6.525029657843462),
-                                    ("<day-of-month> (ordinal)intersect", -6.119564549735298),
-                                    ("mm/dd<time-of-day> am|pm", -6.525029657843462),
-                                    ("hourhour", -3.554615192273761),
-                                    ("Mahavir Jayantiyear (latent)", -6.119564549735298),
-                                    ("Navaratriin|during <named-month>|year", -6.525029657843462),
-                                    ("National Patriots' Dayyear (latent)", -5.831882477283517),
-                                    ("Wednesdaythis|last|next <cycle>", -6.525029657843462),
-                                    ("Lentyear (latent)", -6.525029657843462),
+                                     -6.520621127558696),
+                                    ("today<time-of-day> am|pm", -6.520621127558696),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.115156019450532),
+                                    ("at <time-of-day><time> <part-of-day>", -6.520621127558696),
+                                    ("<day-of-month> (ordinal)intersect", -6.115156019450532),
+                                    ("mm/dd<time-of-day> am|pm", -6.520621127558696),
+                                    ("hourhour", -3.550206661988995),
+                                    ("Mahavir Jayantiyear (latent)", -6.115156019450532),
+                                    ("Navaratriin|during <named-month>|year", -6.520621127558696),
+                                    ("National Patriots' Dayyear (latent)", -5.827473946998751),
+                                    ("Wednesdaythis|last|next <cycle>", -6.520621127558696),
+                                    ("Lentyear (latent)", -6.520621127558696),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.6532274809418706),
-                                    ("Boghiyear (latent)", -6.525029657843462),
-                                    ("dayyear", -1.861590563731395),
+                                     -4.6488189506571045),
+                                    ("Boghiyear (latent)", -6.520621127558696),
+                                    ("dayyear", -1.857182033446629),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.525029657843462),
-                                    ("Thursdayfrom|since|after <time>", -6.119564549735298),
+                                     -6.520621127558696),
+                                    ("Thursdayfrom|since|after <time>", -6.115156019450532),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.525029657843462),
-                                    ("Thursdayat <time-of-day>", -5.831882477283517),
-                                    ("Islamic New Yearyear (latent)", -6.119564549735298),
-                                    ("Laylat al-Qadryear (latent)", -5.608738925969307),
-                                    ("part of days<time-of-day> am|pm", -6.525029657843462),
-                                    ("Discovery Dayyear (latent)", -6.119564549735298),
-                                    ("Shrove Tuesdayyear (latent)", -6.525029657843462),
+                                     -6.520621127558696),
+                                    ("Thursdayat <time-of-day>", -5.827473946998751),
+                                    ("Islamic New Yearyear (latent)", -6.115156019450532),
+                                    ("Laylat al-Qadryear (latent)", -5.604330395684541),
+                                    ("part of days<time-of-day> am|pm", -6.520621127558696),
+                                    ("Discovery Dayyear (latent)", -6.115156019450532),
+                                    ("Shrove Tuesdayyear (latent)", -6.520621127558696),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.831882477283517),
-                                    ("hourminute", -6.119564549735298),
-                                    ("<time-of-day> am|pmtomorrow", -5.608738925969307),
-                                    ("Yom Kippuryear (latent)", -6.525029657843462),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.831882477283517),
-                                    ("<part-of-day> of <time>year (latent)", -6.525029657843462),
-                                    ("minutehour", -5.272266689348094),
-                                    ("Kaanum Pongalyear (latent)", -6.119564549735298),
-                                    ("Maha Saptamiyear (latent)", -6.525029657843462),
+                                     -5.827473946998751),
+                                    ("hourminute", -6.115156019450532),
+                                    ("<time-of-day> am|pmtomorrow", -5.604330395684541),
+                                    ("Yom Kippuryear (latent)", -6.520621127558696),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.827473946998751),
+                                    ("<part-of-day> of <time>year (latent)", -6.520621127558696),
+                                    ("minutehour", -5.267858159063328),
+                                    ("Kaanum Pongalyear (latent)", -6.115156019450532),
+                                    ("Maha Saptamiyear (latent)", -6.520621127558696),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.831882477283517),
-                                    ("time-of-day (latent)tomorrow", -5.608738925969307),
-                                    ("part of daysat <time-of-day>", -4.915591745409362),
+                                     -5.827473946998751),
+                                    ("time-of-day (latent)tomorrow", -5.604330395684541),
+                                    ("part of daysat <time-of-day>", -4.911183215124596),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.510126637301197),
-                                    ("for <duration> from <time>December", -6.525029657843462),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.525029657843462),
+                                     -4.505718107016431),
+                                    ("for <duration> from <time>December", -6.520621127558696),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.520621127558696),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272266689348094),
+                                     -5.267858159063328),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.272266689348094),
-                                    ("time-of-day (latent)this <part-of-day>", -6.525029657843462),
-                                    ("Pentecostyear (latent)", -6.525029657843462),
+                                     -5.267858159063328),
+                                    ("time-of-day (latent)this <part-of-day>", -6.520621127558696),
+                                    ("Pentecostyear (latent)", -6.520621127558696),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272266689348094),
-                                    ("<day-of-month> (ordinal)February", -6.525029657843462),
-                                    ("Eid al-Fitryear (latent)", -5.1387352967235715),
+                                     -5.267858159063328),
+                                    ("<day-of-month> (ordinal)February", -6.520621127558696),
+                                    ("Eid al-Fitryear (latent)", -5.1343267664388055),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.525029657843462),
-                                    ("Mondayin|during the <part-of-day>", -6.525029657843462),
-                                    ("Chhathin|during <named-month>|year", -6.525029657843462),
-                                    ("Diwaliin|during <named-month>|year", -6.525029657843462),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.525029657843462),
-                                    ("Vaisakhiin|during <named-month>|year", -6.525029657843462),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.272266689348094),
-                                    ("Raksha Bandhanyear (latent)", -6.525029657843462),
-                                    ("daysecond", -6.119564549735298),
+                                     -6.520621127558696),
+                                    ("Mondayin|during the <part-of-day>", -6.520621127558696),
+                                    ("Chhathin|during <named-month>|year", -6.520621127558696),
+                                    ("Diwaliin|during <named-month>|year", -6.520621127558696),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.520621127558696),
+                                    ("Vaisakhiin|during <named-month>|year", -6.520621127558696),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.267858159063328),
+                                    ("Raksha Bandhanyear (latent)", -6.520621127558696),
+                                    ("daysecond", -6.115156019450532),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.119564549735298),
-                                    ("Ratha-Yatrayear (latent)", -6.525029657843462),
-                                    ("Ashurayear (latent)", -6.525029657843462),
-                                    ("Tuesdayin|during <named-month>|year", -6.525029657843462),
-                                    ("Chinese New Yearyear (latent)", -6.525029657843462),
-                                    ("tomorrowintersect", -6.525029657843462),
-                                    ("Lag BaOmeryear (latent)", -6.525029657843462),
+                                     -6.115156019450532),
+                                    ("Ratha-Yatrayear (latent)", -6.520621127558696),
+                                    ("Ashurayear (latent)", -6.520621127558696),
+                                    ("Tuesdayin|during <named-month>|year", -6.520621127558696),
+                                    ("Chinese New Yearyear (latent)", -6.520621127558696),
+                                    ("tomorrowintersect", -6.520621127558696),
+                                    ("Lag BaOmeryear (latent)", -6.520621127558696),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.525029657843462),
-                                    ("Eid al-Adhayear (latent)", -4.384963494347192),
-                                    ("intersectin|during the <part-of-day>", -6.525029657843462),
-                                    ("Palm Sundayyear (latent)", -6.525029657843462),
-                                    ("Christmasat <time-of-day>", -6.525029657843462),
-                                    ("Passoveryear (latent)", -6.525029657843462),
-                                    ("Lazarus Saturdayyear (latent)", -6.525029657843462),
+                                     -6.520621127558696),
+                                    ("Eid al-Adhayear (latent)", -4.3805549640624255),
+                                    ("intersectin|during the <part-of-day>", -6.520621127558696),
+                                    ("Palm Sundayyear (latent)", -6.520621127558696),
+                                    ("Christmasat <time-of-day>", -6.520621127558696),
+                                    ("Passoveryear (latent)", -6.520621127558696),
+                                    ("Lazarus Saturdayyear (latent)", -6.520621127558696),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.525029657843462),
-                                    ("hhhmmon <day>", -5.608738925969307),
-                                    ("Yom HaShoahyear (latent)", -6.119564549735298),
+                                     -6.520621127558696),
+                                    ("hhhmmon <day>", -5.604330395684541),
+                                    ("Yom HaShoahyear (latent)", -6.115156019450532),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.119564549735298),
+                                     -6.115156019450532),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.525029657843462),
-                                    ("Septemberyear (latent)", -6.119564549735298),
+                                     -6.520621127558696),
+                                    ("Septemberyear (latent)", -6.115156019450532),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.020952261067188),
-                                    ("Halloweenyear (latent)", -6.525029657843462),
+                                     -5.016543730782422),
+                                    ("Halloweenyear (latent)", -6.520621127558696),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.119564549735298),
+                                     -6.115156019450532),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.831882477283517),
+                                     -5.827473946998751),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.525029657843462),
-                                    ("at <time-of-day>intersect", -5.608738925969307),
-                                    ("Rosh Hashanahyear (latent)", -5.831882477283517),
-                                    ("Dhanterasyear (latent)", -6.525029657843462),
-                                    ("Tu BiShvatyear (latent)", -6.525029657843462),
-                                    ("<day-of-month> (ordinal)December", -5.831882477283517),
-                                    ("Holiyear (latent)", -5.831882477283517),
+                                     -6.520621127558696),
+                                    ("at <time-of-day>intersect", -5.604330395684541),
+                                    ("Rosh Hashanahyear (latent)", -5.827473946998751),
+                                    ("Dhanterasyear (latent)", -6.520621127558696),
+                                    ("Tu BiShvatyear (latent)", -6.520621127558696),
+                                    ("<day-of-month> (ordinal)December", -5.827473946998751),
+                                    ("Holiyear (latent)", -5.827473946998751),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.525029657843462),
-                                    ("Holika Dahanyear (latent)", -5.831882477283517),
+                                     -6.520621127558696),
+                                    ("Holika Dahanyear (latent)", -5.827473946998751),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.119564549735298),
-                                    ("dayminute", -3.1751255705688575),
-                                    ("Mawlidyear (latent)", -6.525029657843462),
+                                     -6.115156019450532),
+                                    ("dayminute", -3.1707170402840914),
+                                    ("Mawlidyear (latent)", -6.520621127558696),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.119564549735298),
+                                     -6.115156019450532),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.525029657843462),
-                                    ("Jumu'atul-Widayear (latent)", -5.608738925969307),
-                                    ("minuteday", -2.775525581913091),
+                                     -6.520621127558696),
+                                    ("Jumu'atul-Widayear (latent)", -5.604330395684541),
+                                    ("minuteday", -2.771117051628325),
                                     ("absorption of , after named dayintersect",
-                                     -5.831882477283517),
-                                    ("intersectyear (latent)", -6.525029657843462),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.525029657843462),
+                                     -5.827473946998751),
+                                    ("intersectyear (latent)", -6.520621127558696),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.520621127558696),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.525029657843462),
+                                     -6.520621127558696),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.525029657843462),
-                                    ("intersecthhhmm", -6.119564549735298),
+                                     -6.520621127558696),
+                                    ("intersecthhhmm", -6.115156019450532),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.525029657843462),
-                                    ("Boss's Dayyear (latent)", -6.119564549735298),
+                                     -6.520621127558696),
+                                    ("Boss's Dayyear (latent)", -6.115156019450532),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.525029657843462),
-                                    ("Global Youth Service Dayyear (latent)", -6.525029657843462),
-                                    ("Dhanterasin|during <named-month>|year", -6.525029657843462),
-                                    ("tonight<time-of-day> o'clock", -6.525029657843462),
-                                    ("Tisha B'Avyear (latent)", -6.525029657843462),
-                                    ("Isra and Mi'rajyear (latent)", -5.608738925969307),
-                                    ("at <time-of-day>on <day>", -4.915591745409362),
+                                     -6.520621127558696),
+                                    ("Global Youth Service Dayyear (latent)", -6.520621127558696),
+                                    ("Dhanterasin|during <named-month>|year", -6.520621127558696),
+                                    ("tonight<time-of-day> o'clock", -6.520621127558696),
+                                    ("Tisha B'Avyear (latent)", -6.520621127558696),
+                                    ("Isra and Mi'rajyear (latent)", -5.604330395684541),
+                                    ("at <time-of-day>on <day>", -4.911183215124596),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.119564549735298),
+                                     -6.115156019450532),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.831882477283517),
-                                    ("Christmasyear (latent)", -6.119564549735298),
-                                    ("Saturdayintersect", -6.525029657843462),
-                                    ("Naraka Chaturdashiyear (latent)", -6.119564549735298),
-                                    ("Thai Pongalin|during <named-month>|year", -6.525029657843462),
-                                    ("dayweek", -6.525029657843462),
-                                    ("Easter Sundayyear (latent)", -5.831882477283517),
+                                     -5.827473946998751),
+                                    ("Christmasyear (latent)", -6.115156019450532),
+                                    ("Saturdayintersect", -6.520621127558696),
+                                    ("Naraka Chaturdashiyear (latent)", -6.115156019450532),
+                                    ("Thai Pongalin|during <named-month>|year", -6.520621127558696),
+                                    ("dayweek", -6.520621127558696),
+                                    ("Easter Sundayyear (latent)", -5.827473946998751),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.119564549735298),
-                                    ("Labour Dayyear (latent)", -6.525029657843462),
-                                    ("weekyear", -5.426417369175352),
-                                    ("King's Dayyear (latent)", -5.020952261067188),
-                                    ("hh:mmin|during the <part-of-day>", -5.608738925969307),
+                                     -6.115156019450532),
+                                    ("Labour Dayyear (latent)", -6.520621127558696),
+                                    ("weekyear", -5.422008838890586),
+                                    ("King's Dayyear (latent)", -5.016543730782422),
+                                    ("hh:mmin|during the <part-of-day>", -5.604330395684541),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.119564549735298),
+                                     -6.115156019450532),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.831882477283517),
-                                    ("Hanukkahyear (latent)", -5.831882477283517),
-                                    ("Rama Navamiyear (latent)", -6.525029657843462),
-                                    ("February<time> <part-of-day>", -6.525029657843462),
+                                     -5.827473946998751),
+                                    ("Hanukkahyear (latent)", -5.827473946998751),
+                                    ("Rama Navamiyear (latent)", -6.520621127558696),
+                                    ("February<time> <part-of-day>", -6.520621127558696),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.831882477283517),
-                                    ("Great Lentyear (latent)", -6.525029657843462),
-                                    ("tomorrowat <time-of-day>", -5.831882477283517),
+                                     -5.827473946998751),
+                                    ("Great Lentyear (latent)", -6.520621127558696),
+                                    ("tomorrowat <time-of-day>", -5.827473946998751),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.525029657843462),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.119564549735298),
-                                    ("Ugadiyear (latent)", -5.1387352967235715),
-                                    ("Vaisakhiyear (latent)", -5.831882477283517),
+                                     -6.520621127558696),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.115156019450532),
+                                    ("Ugadiyear (latent)", -5.1343267664388055),
+                                    ("Vaisakhiyear (latent)", -5.827473946998751),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.831882477283517),
-                                    ("last <cycle> of <time>year (latent)", -5.831882477283517),
-                                    ("at <time-of-day>tomorrow", -6.119564549735298),
-                                    ("tomorrow<time-of-day> am|pm", -6.525029657843462),
+                                     -5.827473946998751),
+                                    ("last <cycle> of <time>year (latent)", -5.827473946998751),
+                                    ("at <time-of-day>tomorrow", -6.115156019450532),
+                                    ("tomorrow<time-of-day> am|pm", -6.520621127558696),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.525029657843462),
-                                    ("Diwaliyear (latent)", -6.525029657843462),
-                                    ("between <time> and <time>on <day>", -6.119564549735298),
-                                    ("Black Fridayyear (latent)", -6.119564549735298),
+                                     -6.520621127558696),
+                                    ("Diwaliyear (latent)", -6.520621127558696),
+                                    ("between <time> and <time>on <day>", -6.115156019450532),
+                                    ("Black Fridayyear (latent)", -6.115156019450532),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.525029657843462),
+                                     -6.520621127558696),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.525029657843462),
-                                    ("Chhathyear (latent)", -6.119564549735298),
-                                    ("Vasant Panchamiyear (latent)", -6.525029657843462),
-                                    ("Rabindra Jayantiyear (latent)", -5.272266689348094),
-                                    ("this <part-of-day>at <time-of-day>", -5.272266689348094),
-                                    ("St Patrick's Dayyear (latent)", -6.525029657843462),
-                                    ("Thursday<time> (timezone)", -6.525029657843462),
+                                     -6.520621127558696),
+                                    ("Chhathyear (latent)", -6.115156019450532),
+                                    ("Vasant Panchamiyear (latent)", -6.520621127558696),
+                                    ("Rabindra Jayantiyear (latent)", -5.267858159063328),
+                                    ("this <part-of-day>at <time-of-day>", -5.267858159063328),
+                                    ("St Patrick's Dayyear (latent)", -6.520621127558696),
+                                    ("Thursday<time> (timezone)", -6.520621127558696),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.525029657843462),
-                                    ("Pargat Diwasyear (latent)", -5.272266689348094),
-                                    ("<datetime> - <datetime> (interval)July", -6.119564549735298),
+                                     -6.520621127558696),
+                                    ("Pargat Diwasyear (latent)", -5.267858159063328),
+                                    ("<datetime> - <datetime> (interval)July", -6.115156019450532),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.831882477283517),
-                                    ("Februaryintersect", -6.525029657843462),
-                                    ("Mother's Dayyear (latent)", -6.525029657843462),
-                                    ("Simchat Torahyear (latent)", -6.525029657843462),
-                                    ("Victoria Dayyear (latent)", -6.119564549735298),
-                                    ("minuteyear", -6.525029657843462)],
+                                     -5.827473946998751),
+                                    ("Februaryintersect", -6.520621127558696),
+                                    ("Mother's Dayyear (latent)", -6.520621127558696),
+                                    ("Simchat Torahyear (latent)", -6.520621127558696),
+                                    ("Victoria Dayyear (latent)", -6.115156019450532),
+                                    ("minuteyear", -6.520621127558696)],
                                n = 525},
                    koData =
-                     ClassData{prior = -0.9652283125692465,
-                               unseen = -6.8679744089702925,
+                     ClassData{prior = -1.0266897275856797, unseen = -6.796823718274855,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.669708707125663),
-                                    ("hourday", -3.571096418457553),
+                                   [("Thursdayhhhmm", -4.598481197837295),
+                                    ("hourday", -3.499868909169185),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.173786103901937),
-                                    ("<day-of-month> (ordinal)August", -6.173786103901937),
-                                    ("dayhour", -3.499637454475408),
-                                    ("<time> timezoneyear (latent)", -5.480638923341991),
+                                     -6.102558594613569),
+                                    ("<day-of-month> (ordinal)August", -6.102558594613569),
+                                    ("dayhour", -3.42840994518704),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2574953720277815),
-                                    ("Tuesdayfrom|since|after <time>", -5.480638923341991),
-                                    ("daymonth", -3.4657359027997265),
-                                    ("hourquarter", -5.2574953720277815),
-                                    ("monthyear", -4.9210231354065685),
-                                    ("<time-of-day> am|pmyear (latent)", -5.480638923341991),
-                                    ("Thai Pongalyear (latent)", -5.480638923341991),
-                                    ("intersecthh:mm", -6.173786103901937),
+                                     -5.186267862739414),
+                                    ("Tuesdayfrom|since|after <time>", -5.409411414053624),
+                                    ("daymonth", -3.3945083935113587),
+                                    ("hourquarter", -5.186267862739414),
+                                    ("monthyear", -4.849795626118201),
+                                    ("Thai Pongalyear (latent)", -5.409411414053624),
+                                    ("intersecthh:mm", -6.102558594613569),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.768320995793772),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.173786103901937),
-                                    ("houryear", -4.382026634673881),
+                                     -5.697093486505405),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.102558594613569),
+                                    ("houryear", -4.716264233493678),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.173786103901937),
-                                    ("<day-of-month> (ordinal)October", -6.173786103901937),
+                                     -6.102558594613569),
+                                    ("<day-of-month> (ordinal)October", -6.102558594613569),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.480638923341991),
-                                    ("hournograin", -4.9210231354065685),
-                                    ("<time-of-day> am|pmintersect", -4.9210231354065685),
-                                    ("Octoberyear (latent)", -6.173786103901937),
-                                    ("Good Fridayyear (latent)", -5.768320995793772),
+                                     -5.409411414053624),
+                                    ("hournograin", -4.849795626118201),
+                                    ("<time-of-day> am|pmintersect", -4.849795626118201),
+                                    ("Octoberyear (latent)", -6.102558594613569),
+                                    ("Good Fridayyear (latent)", -5.697093486505405),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.768320995793772),
-                                    ("early morningat <time-of-day>", -6.173786103901937),
-                                    ("until <time>on <day>", -5.480638923341991),
+                                     -5.697093486505405),
+                                    ("early morningat <time-of-day>", -6.102558594613569),
+                                    ("until <time>on <day>", -5.409411414053624),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.173786103901937),
-                                    ("time-of-day (latent)intersect", -5.480638923341991),
-                                    ("todayin <number> (implicit minutes)", -6.173786103901937),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.480638923341991),
+                                     -6.102558594613569),
+                                    ("time-of-day (latent)intersect", -5.409411414053624),
+                                    ("todayin <number> (implicit minutes)", -6.102558594613569),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.173786103901937),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.173786103901937),
-                                    ("hh:mmon <day>", -4.9210231354065685),
-                                    ("hhhmmintersect", -5.768320995793772),
-                                    ("absorption of , after named dayJuly", -5.2574953720277815),
-                                    ("from|since|after <time>July", -5.768320995793772),
+                                     -6.102558594613569),
+                                    ("hh:mmon <day>", -4.849795626118201),
+                                    ("hhhmmintersect", -5.697093486505405),
+                                    ("absorption of , after named dayJuly", -5.186267862739414),
+                                    ("from|since|after <time>July", -5.697093486505405),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2574953720277815),
-                                    ("Clean Mondayyear (latent)", -6.173786103901937),
-                                    ("monthhour", -6.173786103901937),
+                                     -5.186267862739414),
+                                    ("Clean Mondayyear (latent)", -6.102558594613569),
+                                    ("monthhour", -6.102558594613569),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.768320995793772),
-                                    ("hourmonth", -4.033719940405666),
-                                    ("todayat <time-of-day>", -6.173786103901937),
-                                    ("hhhmmyear (latent)", -4.9210231354065685),
-                                    ("from|since|after <time>December", -6.173786103901937),
+                                     -5.697093486505405),
+                                    ("hourmonth", -3.962492431117298),
+                                    ("todayat <time-of-day>", -6.102558594613569),
+                                    ("from|since|after <time>December", -6.102558594613569),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.173786103901937),
-                                    ("<time-of-day> am|pmon <day>", -4.9210231354065685),
-                                    ("Mondayyear (latent)", -5.480638923341991),
-                                    ("dayday", -4.033719940405666),
-                                    ("mm/ddat <time-of-day>", -5.768320995793772),
-                                    ("on <day>September", -5.480638923341991),
-                                    ("time-of-day (latent)September", -5.768320995793772),
-                                    ("hourhour", -4.0943445622221),
-                                    ("time-of-day (latent)on <day>", -4.669708707125663),
+                                     -6.102558594613569),
+                                    ("<time-of-day> am|pmon <day>", -4.849795626118201),
+                                    ("Mondayyear (latent)", -5.409411414053624),
+                                    ("dayday", -3.962492431117298),
+                                    ("mm/ddat <time-of-day>", -5.697093486505405),
+                                    ("on <day>September", -5.409411414053624),
+                                    ("time-of-day (latent)September", -5.697093486505405),
+                                    ("hourhour", -4.023117052933733),
+                                    ("time-of-day (latent)on <day>", -4.598481197837295),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.768320995793772),
-                                    ("dayyear", -3.1292636661785136),
-                                    ("Thursdaymm/dd", -6.173786103901937),
-                                    ("New Year's Dayyear (latent)", -5.2574953720277815),
-                                    ("time-of-day (latent)Sunday", -5.768320995793772),
-                                    ("Thursdayfrom|since|after <time>", -4.469038011663511),
-                                    ("Thursdayat <time-of-day>", -4.564348191467836),
+                                     -5.697093486505405),
+                                    ("dayyear", -3.299198213707034),
+                                    ("Thursdaymm/dd", -6.102558594613569),
+                                    ("New Year's Dayyear (latent)", -5.186267862739414),
+                                    ("time-of-day (latent)Sunday", -5.697093486505405),
+                                    ("Thursdayfrom|since|after <time>", -4.397810502375144),
+                                    ("Thursdayat <time-of-day>", -4.493120682179469),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.173786103901937),
-                                    ("Aprilyear (latent)", -6.173786103901937),
-                                    ("the <day-of-month> (ordinal)July", -6.173786103901937),
-                                    ("the <day-of-month> (number)July", -6.173786103901937),
-                                    ("monthminute", -6.173786103901937),
-                                    ("<time-of-day> am|pmtomorrow", -5.768320995793772),
-                                    ("Thursdayhh:mm", -5.2574953720277815),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.768320995793772),
-                                    ("minutemonth", -4.033719940405666),
-                                    ("time-of-day (latent)Friday", -5.768320995793772),
-                                    ("minutehour", -6.173786103901937),
-                                    ("part of daysat <time-of-day>", -5.075173815233827),
+                                     -6.102558594613569),
+                                    ("Aprilyear (latent)", -6.102558594613569),
+                                    ("the <day-of-month> (ordinal)July", -6.102558594613569),
+                                    ("the <day-of-month> (number)July", -6.102558594613569),
+                                    ("monthminute", -6.102558594613569),
+                                    ("<time-of-day> am|pmtomorrow", -5.697093486505405),
+                                    ("Thursdayhh:mm", -5.186267862739414),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.697093486505405),
+                                    ("minutemonth", -3.962492431117298),
+                                    ("time-of-day (latent)Friday", -5.697093486505405),
+                                    ("minutehour", -6.102558594613569),
+                                    ("part of daysat <time-of-day>", -5.003946305945459),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.822410846738459),
-                                    ("Augustyear (latent)", -5.768320995793772),
-                                    ("week-endin|during <named-month>|year", -6.173786103901937),
-                                    ("time-of-day (latent)Tuesday", -5.768320995793772),
+                                     -3.751183337450091),
+                                    ("Augustyear (latent)", -5.697093486505405),
+                                    ("week-endin|during <named-month>|year", -6.102558594613569),
+                                    ("time-of-day (latent)Tuesday", -5.697093486505405),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.768320995793772),
+                                     -5.697093486505405),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.173786103901937),
+                                     -6.102558594613569),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.173786103901937),
-                                    ("Sundayyear (latent)", -5.2574953720277815),
-                                    ("hourweek", -5.2574953720277815),
-                                    ("the <day-of-month> (ordinal)Monday", -5.480638923341991),
-                                    ("Christmasat <time-of-day>", -6.173786103901937),
-                                    ("from|since|after <time>year (latent)", -5.075173815233827),
-                                    ("hhhmmon <day>", -5.2574953720277815),
-                                    ("yesterday<time-of-day> am|pm", -6.173786103901937),
-                                    ("<day-of-month> (ordinal)July", -5.480638923341991),
+                                     -6.102558594613569),
+                                    ("Sundayyear (latent)", -5.186267862739414),
+                                    ("hourweek", -5.186267862739414),
+                                    ("the <day-of-month> (ordinal)Monday", -5.409411414053624),
+                                    ("Christmasat <time-of-day>", -6.102558594613569),
+                                    ("from|since|after <time>year (latent)", -5.697093486505405),
+                                    ("hhhmmon <day>", -5.186267862739414),
+                                    ("yesterday<time-of-day> am|pm", -6.102558594613569),
+                                    ("<day-of-month> (ordinal)July", -5.409411414053624),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.173786103901937),
-                                    ("mm/ddyear (latent)", -6.173786103901937),
+                                     -6.102558594613569),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.173786103901937),
+                                     -6.102558594613569),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.173786103901937),
-                                    ("at <time-of-day>intersect", -5.2574953720277815),
-                                    ("hh:mmyear (latent)", -4.787491742782046),
-                                    ("Holiyear (latent)", -6.173786103901937),
-                                    ("until <time><time-of-day> am|pm", -6.173786103901937),
+                                     -6.102558594613569),
+                                    ("at <time-of-day>intersect", -5.186267862739414),
+                                    ("Holiyear (latent)", -6.102558594613569),
+                                    ("until <time><time-of-day> am|pm", -6.102558594613569),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.768320995793772),
-                                    ("dayminute", -3.311585222972468),
-                                    ("yyyy-mm-ddhh:mm", -5.768320995793772),
-                                    ("intersectfrom|since|after <time>", -5.768320995793772),
-                                    ("intersectSeptember", -4.301983927000345),
-                                    ("minuteday", -3.016785682751823),
+                                     -5.697093486505405),
+                                    ("dayminute", -3.2403577136841006),
+                                    ("yyyy-mm-ddhh:mm", -5.697093486505405),
+                                    ("intersectfrom|since|after <time>", -5.697093486505405),
+                                    ("intersectSeptember", -4.230756417711977),
+                                    ("minuteday", -2.9455581734634557),
                                     ("absorption of , after named dayintersect",
-                                     -6.173786103901937),
-                                    ("intersectyear (latent)", -6.173786103901937),
-                                    ("Februaryin|during the <part-of-day>", -6.173786103901937),
+                                     -6.102558594613569),
+                                    ("intersectyear (latent)", -6.102558594613569),
+                                    ("Februaryin|during the <part-of-day>", -6.102558594613569),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.173786103901937),
-                                    ("time-of-day (latent)July", -5.480638923341991),
-                                    ("Saturdayyear (latent)", -6.173786103901937),
+                                     -6.102558594613569),
+                                    ("time-of-day (latent)July", -5.409411414053624),
+                                    ("Saturdayyear (latent)", -6.102558594613569),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.173786103901937),
-                                    ("<day-of-month> (ordinal)Monday", -4.9210231354065685),
-                                    ("at <time-of-day>on <day>", -5.2574953720277815),
+                                     -6.102558594613569),
+                                    ("<day-of-month> (ordinal)Monday", -4.849795626118201),
+                                    ("at <time-of-day>on <day>", -5.186267862739414),
                                     ("absorption of , after named daySeptember",
-                                     -4.9210231354065685),
-                                    ("Naraka Chaturdashiyear (latent)", -6.173786103901937),
-                                    ("from|since|after <time>on <day>", -5.2574953720277815),
-                                    ("dayweek", -6.173786103901937),
-                                    ("Easter Sundayyear (latent)", -5.768320995793772),
-                                    ("Thursday<time-of-day> am|pm", -4.9210231354065685),
-                                    ("weekyear", -5.768320995793772),
-                                    ("time-of-day (latent)Thursday", -5.768320995793772),
+                                     -4.849795626118201),
+                                    ("Naraka Chaturdashiyear (latent)", -6.102558594613569),
+                                    ("from|since|after <time>on <day>", -5.186267862739414),
+                                    ("dayweek", -6.102558594613569),
+                                    ("Easter Sundayyear (latent)", -5.697093486505405),
+                                    ("Thursday<time-of-day> am|pm", -4.849795626118201),
+                                    ("weekyear", -5.697093486505405),
+                                    ("time-of-day (latent)Thursday", -5.697093486505405),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.173786103901937),
-                                    ("<day-of-month> (ordinal)April", -6.173786103901937),
+                                     -6.102558594613569),
+                                    ("<day-of-month> (ordinal)April", -6.102558594613569),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.768320995793772),
+                                     -5.697093486505405),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.480638923341991),
-                                    ("Sundayfrom|since|after <time>", -6.173786103901937),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2574953720277815),
+                                     -5.409411414053624),
+                                    ("Sundayfrom|since|after <time>", -6.102558594613569),
+                                    ("absorption of , after named dayFebruary", -5.186267862739414),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.768320995793772),
+                                     -5.697093486505405),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.173786103901937),
-                                    ("tomorrowat <time-of-day>", -6.173786103901937),
-                                    ("daynograin", -5.768320995793772),
-                                    ("Fridayin|during <named-month>|year", -6.173786103901937),
+                                     -6.102558594613569),
+                                    ("tomorrowat <time-of-day>", -6.102558594613569),
+                                    ("daynograin", -5.697093486505405),
+                                    ("Fridayin|during <named-month>|year", -6.102558594613569),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.768320995793772),
-                                    ("last <cycle> of <time>year (latent)", -5.768320995793772),
-                                    ("tomorrow<time-of-day> am|pm", -6.173786103901937),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.480638923341991),
-                                    ("Diwaliyear (latent)", -5.768320995793772),
+                                     -5.697093486505405),
+                                    ("last <cycle> of <time>year (latent)", -5.697093486505405),
+                                    ("tomorrow<time-of-day> am|pm", -6.102558594613569),
+                                    ("Diwaliyear (latent)", -5.697093486505405),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.173786103901937),
-                                    ("this <part-of-day>at <time-of-day>", -5.2574953720277815),
-                                    ("Fridayyear (latent)", -5.2574953720277815),
-                                    ("time-of-day (latent)April", -6.173786103901937),
-                                    ("minuteyear", -3.9765615265657175)],
-                               n = 323}}),
+                                     -6.102558594613569),
+                                    ("this <part-of-day>at <time-of-day>", -5.186267862739414),
+                                    ("Fridayyear (latent)", -5.186267862739414),
+                                    ("time-of-day (latent)April", -6.102558594613569)],
+                               n = 293}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1775,21 +1761,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.13828701585409087,
-                               unseen = -5.484796933490655,
+                     ClassData{prior = -4.1499730906752734e-2,
+                               unseen = -5.480638923341991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.5317807984289897e-2),
-                                    ("intersect 2 numbers", -4.0943445622221)],
+                                   [("integer (numeric)", -2.1142436573809237e-2),
+                                    ("intersect 2 numbers", -4.09016919081162)],
                                n = 236},
                    koData =
-                     ClassData{prior = -2.046770759390287, unseen = -3.6888794541139363,
+                     ClassData{prior = -3.202746442938317, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.5841201044498106),
-                                    ("negative numbers", -0.40546510810816444),
-                                    ("compose by multiplication", -2.277267285009756)],
-                               n = 35}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
diff --git a/Duckling/Ranking/Classifiers/EN_GB.hs b/Duckling/Ranking/Classifiers/EN_GB.hs
index 9d6846e56..fca5ebd57 100644
--- a/Duckling/Ranking/Classifiers/EN_GB.hs
+++ b/Duckling/Ranking/Classifiers/EN_GB.hs
@@ -283,7 +283,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -304,44 +304,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -999,476 +999,465 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4975337939883182, unseen = -7.203405521083095,
+                     ClassData{prior = -0.4614721941962667, unseen = -7.198931240688173,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.509514015963292),
-                                    ("Father's Dayyear (latent)", -6.509514015963292),
-                                    ("Karva Chauthyear (latent)", -6.509514015963292),
+                                   [("Navaratriyear (latent)", -6.505036396541998),
+                                    ("Father's Dayyear (latent)", -6.505036396541998),
+                                    ("Karva Chauthyear (latent)", -6.505036396541998),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.509514015963292),
-                                    ("Maha Shivaratriyear (latent)", -6.509514015963292),
-                                    ("Ramadanyear (latent)", -5.256751047467924),
+                                     -6.505036396541998),
+                                    ("Maha Shivaratriyear (latent)", -6.505036396541998),
+                                    ("Ramadanyear (latent)", -5.25227342804663),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.1232196548434015),
-                                    ("Bhai Doojyear (latent)", -6.509514015963292),
-                                    ("hourday", -4.494610995421027),
-                                    ("dayhour", -3.4649915782398693),
+                                     -5.118742035422107),
+                                    ("Bhai Doojyear (latent)", -6.505036396541998),
+                                    ("hourday", -4.490133375999733),
+                                    ("dayhour", -3.460513958818575),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.1232196548434015),
-                                    ("Martin Luther King's Dayyear (latent)", -6.104048907855128),
-                                    ("Shemini Atzeretyear (latent)", -6.509514015963292),
-                                    ("daymonth", -4.494610995421027),
-                                    ("monthday", -6.104048907855128),
-                                    ("monthyear", -4.717754546735237),
-                                    ("Yom Ha'atzmautyear (latent)", -6.509514015963292),
-                                    ("Orthodox Good Fridayyear (latent)", -6.104048907855128),
-                                    ("Vijayadashamiyear (latent)", -6.509514015963292),
-                                    ("Thanksgiving Dayyear (latent)", -5.410901727295182),
-                                    ("Thai Pongalyear (latent)", -5.816366835403347),
-                                    ("Thiru Onamyear (latent)", -5.816366835403347),
-                                    ("hhhmmabsorption of , after named day", -6.509514015963292),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.509514015963292),
+                                     -5.118742035422107),
+                                    ("Martin Luther King's Dayyear (latent)", -6.099571288433833),
+                                    ("Shemini Atzeretyear (latent)", -6.505036396541998),
+                                    ("daymonth", -4.490133375999733),
+                                    ("monthday", -6.099571288433833),
+                                    ("monthyear", -4.7132769273139425),
+                                    ("Yom Ha'atzmautyear (latent)", -6.505036396541998),
+                                    ("Orthodox Good Fridayyear (latent)", -6.099571288433833),
+                                    ("Vijayadashamiyear (latent)", -6.505036396541998),
+                                    ("Thanksgiving Dayyear (latent)", -5.406424107873888),
+                                    ("Thai Pongalyear (latent)", -5.8118892159820525),
+                                    ("Thiru Onamyear (latent)", -5.8118892159820525),
+                                    ("hhhmmabsorption of , after named day", -6.505036396541998),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.505036396541998),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.593223284089137),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.509514015963292),
-                                    ("Krishna Janmashtamiyear (latent)", -6.104048907855128),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.509514015963292),
-                                    ("houryear", -5.593223284089137),
+                                     -5.588745664667843),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.505036396541998),
+                                    ("Krishna Janmashtamiyear (latent)", -6.099571288433833),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.505036396541998),
+                                    ("houryear", -5.588745664667843),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.509514015963292),
-                                    ("Christmas<time-of-day> am|pm", -6.509514015963292),
+                                     -6.505036396541998),
+                                    ("Christmas<time-of-day> am|pm", -6.505036396541998),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.509514015963292),
+                                     -6.505036396541998),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.816366835403347),
-                                    ("intersectin|during <named-month>|year", -6.509514015963292),
-                                    ("<time-of-day> am|pmintersect", -5.256751047467924),
-                                    ("Earth Houryear (latent)", -6.509514015963292),
-                                    ("Ganesh Chaturthiyear (latent)", -6.509514015963292),
-                                    ("Octoberyear (latent)", -5.0054366191870185),
-                                    ("intersect<time-of-day> am|pm", -6.509514015963292),
-                                    ("Mattu Pongalyear (latent)", -6.509514015963292),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.509514015963292),
-                                    ("Shavuotyear (latent)", -6.509514015963292),
-                                    ("Parsi New Yearyear (latent)", -5.593223284089137),
+                                     -5.8118892159820525),
+                                    ("intersectin|during <named-month>|year", -6.505036396541998),
+                                    ("<time-of-day> am|pmintersect", -5.25227342804663),
+                                    ("Earth Houryear (latent)", -6.505036396541998),
+                                    ("Ganesh Chaturthiyear (latent)", -6.505036396541998),
+                                    ("Octoberyear (latent)", -5.000958999765723),
+                                    ("intersect<time-of-day> am|pm", -6.505036396541998),
+                                    ("Mattu Pongalyear (latent)", -6.505036396541998),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.505036396541998),
+                                    ("Shavuotyear (latent)", -6.505036396541998),
+                                    ("Parsi New Yearyear (latent)", -5.588745664667843),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.509514015963292),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.509514015963292),
-                                    ("todayin|within|after <duration>", -6.509514015963292),
+                                     -6.505036396541998),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.505036396541998),
+                                    ("todayin|within|after <duration>", -6.505036396541998),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.104048907855128),
-                                    ("Marchyear (latent)", -6.509514015963292),
+                                     -6.099571288433833),
+                                    ("Marchyear (latent)", -6.505036396541998),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.104048907855128),
-                                    ("Sukkotyear (latent)", -6.104048907855128),
-                                    ("hhhmmintersect", -6.104048907855128),
+                                     -6.099571288433833),
+                                    ("Sukkotyear (latent)", -6.099571288433833),
+                                    ("hhhmmintersect", -6.099571288433833),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.104048907855128),
-                                    ("Clean Mondayyear (latent)", -6.104048907855128),
-                                    ("monthhour", -6.104048907855128),
+                                     -6.099571288433833),
+                                    ("Clean Mondayyear (latent)", -6.099571288433833),
+                                    ("monthhour", -6.099571288433833),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.593223284089137),
-                                    ("todayat <time-of-day>", -6.509514015963292),
-                                    ("Thursday<time> timezone", -4.111618743164922),
-                                    ("tonight<time-of-day> am|pm", -6.509514015963292),
-                                    ("time-of-day (latent)tonight", -6.104048907855128),
-                                    ("from|since|after <time>December", -6.509514015963292),
-                                    ("dd/mm<time-of-day> am|pm", -6.509514015963292),
-                                    ("<time-of-day> am|pmon <day>", -4.494610995421027),
+                                     -5.588745664667843),
+                                    ("todayat <time-of-day>", -6.505036396541998),
+                                    ("Thursday<time> timezone", -4.107141123743627),
+                                    ("tonight<time-of-day> am|pm", -6.505036396541998),
+                                    ("time-of-day (latent)tonight", -6.099571288433833),
+                                    ("from|since|after <time>December", -6.505036396541998),
+                                    ("dd/mm<time-of-day> am|pm", -6.505036396541998),
+                                    ("<time-of-day> am|pmon <day>", -4.490133375999733),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.509514015963292),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.104048907855128),
-                                    ("dayday", -3.736925293723511),
-                                    ("dd/mmat <time-of-day>", -6.509514015963292),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.104048907855128),
-                                    ("tonightat <time-of-day>", -5.410901727295182),
+                                     -6.505036396541998),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.099571288433833),
+                                    ("dayday", -3.732447674302217),
+                                    ("dd/mmat <time-of-day>", -6.505036396541998),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.099571288433833),
+                                    ("tonightat <time-of-day>", -5.406424107873888),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.816366835403347),
+                                     -5.8118892159820525),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.509514015963292),
-                                    ("today<time-of-day> am|pm", -6.509514015963292),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.104048907855128),
-                                    ("at <time-of-day><time> <part-of-day>", -6.509514015963292),
-                                    ("<day-of-month> (ordinal)intersect", -6.104048907855128),
-                                    ("hourhour", -3.539099550393591),
-                                    ("Mahavir Jayantiyear (latent)", -6.104048907855128),
-                                    ("Navaratriin|during <named-month>|year", -6.509514015963292),
-                                    ("Wednesdaythis|last|next <cycle>", -6.509514015963292),
-                                    ("Lentyear (latent)", -6.509514015963292),
+                                     -6.505036396541998),
+                                    ("today<time-of-day> am|pm", -6.505036396541998),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.099571288433833),
+                                    ("at <time-of-day><time> <part-of-day>", -6.505036396541998),
+                                    ("<day-of-month> (ordinal)intersect", -6.099571288433833),
+                                    ("hourhour", -3.5346219309722966),
+                                    ("Mahavir Jayantiyear (latent)", -6.099571288433833),
+                                    ("Navaratriin|during <named-month>|year", -6.505036396541998),
+                                    ("Wednesdaythis|last|next <cycle>", -6.505036396541998),
+                                    ("Lentyear (latent)", -6.505036396541998),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.6377118390617005),
-                                    ("Boghiyear (latent)", -6.509514015963292),
-                                    ("dayyear", -1.8943934991220328),
+                                     -4.633234219640406),
+                                    ("Boghiyear (latent)", -6.505036396541998),
+                                    ("dayyear", -1.8899158797007385),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.509514015963292),
-                                    ("Thursdayfrom|since|after <time>", -6.104048907855128),
+                                     -6.505036396541998),
+                                    ("Thursdayfrom|since|after <time>", -6.099571288433833),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.509514015963292),
-                                    ("Thursdayat <time-of-day>", -5.816366835403347),
-                                    ("Islamic New Yearyear (latent)", -6.104048907855128),
-                                    ("Laylat al-Qadryear (latent)", -5.593223284089137),
-                                    ("part of days<time-of-day> am|pm", -6.509514015963292),
-                                    ("Shrove Tuesdayyear (latent)", -6.509514015963292),
+                                     -6.505036396541998),
+                                    ("Thursdayat <time-of-day>", -5.8118892159820525),
+                                    ("Islamic New Yearyear (latent)", -6.099571288433833),
+                                    ("Laylat al-Qadryear (latent)", -5.588745664667843),
+                                    ("part of days<time-of-day> am|pm", -6.505036396541998),
+                                    ("Shrove Tuesdayyear (latent)", -6.505036396541998),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.816366835403347),
-                                    ("hourminute", -6.104048907855128),
-                                    ("<time-of-day> am|pmtomorrow", -5.593223284089137),
-                                    ("Yom Kippuryear (latent)", -6.509514015963292),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.816366835403347),
-                                    ("<part-of-day> of <time>year (latent)", -6.509514015963292),
-                                    ("minutehour", -5.256751047467924),
-                                    ("Kaanum Pongalyear (latent)", -6.104048907855128),
-                                    ("Maha Saptamiyear (latent)", -6.509514015963292),
+                                     -5.8118892159820525),
+                                    ("hourminute", -6.099571288433833),
+                                    ("<time-of-day> am|pmtomorrow", -5.588745664667843),
+                                    ("Yom Kippuryear (latent)", -6.505036396541998),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.8118892159820525),
+                                    ("<part-of-day> of <time>year (latent)", -6.505036396541998),
+                                    ("minutehour", -5.25227342804663),
+                                    ("Kaanum Pongalyear (latent)", -6.099571288433833),
+                                    ("Maha Saptamiyear (latent)", -6.505036396541998),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.816366835403347),
-                                    ("time-of-day (latent)tomorrow", -5.593223284089137),
-                                    ("part of daysat <time-of-day>", -4.900076103529192),
+                                     -5.8118892159820525),
+                                    ("time-of-day (latent)tomorrow", -5.588745664667843),
+                                    ("part of daysat <time-of-day>", -4.895598484107897),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.494610995421027),
-                                    ("for <duration> from <time>December", -6.509514015963292),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.509514015963292),
+                                     -4.490133375999733),
+                                    ("for <duration> from <time>December", -6.505036396541998),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.505036396541998),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.256751047467924),
+                                     -5.25227342804663),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.256751047467924),
-                                    ("time-of-day (latent)this <part-of-day>", -6.509514015963292),
-                                    ("Pentecostyear (latent)", -6.509514015963292),
+                                     -5.25227342804663),
+                                    ("time-of-day (latent)this <part-of-day>", -6.505036396541998),
+                                    ("Pentecostyear (latent)", -6.505036396541998),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.256751047467924),
-                                    ("<day-of-month> (ordinal)February", -6.509514015963292),
-                                    ("Eid al-Fitryear (latent)", -5.1232196548434015),
+                                     -5.25227342804663),
+                                    ("<day-of-month> (ordinal)February", -6.505036396541998),
+                                    ("Eid al-Fitryear (latent)", -5.118742035422107),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.509514015963292),
-                                    ("Mondayin|during the <part-of-day>", -6.509514015963292),
-                                    ("Chhathin|during <named-month>|year", -6.509514015963292),
-                                    ("Diwaliin|during <named-month>|year", -6.509514015963292),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.509514015963292),
-                                    ("Vaisakhiin|during <named-month>|year", -6.509514015963292),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.256751047467924),
-                                    ("Raksha Bandhanyear (latent)", -6.509514015963292),
-                                    ("daysecond", -6.104048907855128),
+                                     -6.505036396541998),
+                                    ("Mondayin|during the <part-of-day>", -6.505036396541998),
+                                    ("Chhathin|during <named-month>|year", -6.505036396541998),
+                                    ("Diwaliin|during <named-month>|year", -6.505036396541998),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.505036396541998),
+                                    ("Vaisakhiin|during <named-month>|year", -6.505036396541998),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.25227342804663),
+                                    ("Raksha Bandhanyear (latent)", -6.505036396541998),
+                                    ("daysecond", -6.099571288433833),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.104048907855128),
-                                    ("Ratha-Yatrayear (latent)", -6.509514015963292),
-                                    ("Ashurayear (latent)", -6.509514015963292),
-                                    ("Tuesdayin|during <named-month>|year", -6.509514015963292),
-                                    ("Chinese New Yearyear (latent)", -6.509514015963292),
-                                    ("tomorrowintersect", -6.509514015963292),
-                                    ("Lag BaOmeryear (latent)", -6.509514015963292),
+                                     -6.099571288433833),
+                                    ("Ratha-Yatrayear (latent)", -6.505036396541998),
+                                    ("Ashurayear (latent)", -6.505036396541998),
+                                    ("Tuesdayin|during <named-month>|year", -6.505036396541998),
+                                    ("Chinese New Yearyear (latent)", -6.505036396541998),
+                                    ("tomorrowintersect", -6.505036396541998),
+                                    ("Lag BaOmeryear (latent)", -6.505036396541998),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.509514015963292),
-                                    ("Eid al-Adhayear (latent)", -4.3694478524670215),
-                                    ("intersectin|during the <part-of-day>", -6.509514015963292),
-                                    ("Palm Sundayyear (latent)", -6.509514015963292),
-                                    ("Christmasat <time-of-day>", -6.509514015963292),
-                                    ("Passoveryear (latent)", -6.509514015963292),
-                                    ("Lazarus Saturdayyear (latent)", -6.509514015963292),
+                                     -6.505036396541998),
+                                    ("Eid al-Adhayear (latent)", -4.364970233045727),
+                                    ("intersectin|during the <part-of-day>", -6.505036396541998),
+                                    ("Palm Sundayyear (latent)", -6.505036396541998),
+                                    ("Christmasat <time-of-day>", -6.505036396541998),
+                                    ("Passoveryear (latent)", -6.505036396541998),
+                                    ("Lazarus Saturdayyear (latent)", -6.505036396541998),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.509514015963292),
-                                    ("hhhmmon <day>", -5.593223284089137),
-                                    ("Yom HaShoahyear (latent)", -6.104048907855128),
+                                     -6.505036396541998),
+                                    ("hhhmmon <day>", -5.588745664667843),
+                                    ("Yom HaShoahyear (latent)", -6.099571288433833),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.104048907855128),
+                                     -6.099571288433833),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.509514015963292),
-                                    ("Septemberyear (latent)", -6.104048907855128),
+                                     -6.505036396541998),
+                                    ("Septemberyear (latent)", -6.099571288433833),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.0054366191870185),
-                                    ("Halloweenyear (latent)", -6.509514015963292),
+                                     -5.000958999765723),
+                                    ("Halloweenyear (latent)", -6.505036396541998),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.104048907855128),
+                                     -6.099571288433833),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.816366835403347),
+                                     -5.8118892159820525),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.509514015963292),
-                                    ("at <time-of-day>intersect", -5.593223284089137),
-                                    ("Rosh Hashanahyear (latent)", -5.816366835403347),
-                                    ("Dhanterasyear (latent)", -6.509514015963292),
-                                    ("Tu BiShvatyear (latent)", -6.509514015963292),
-                                    ("<day-of-month> (ordinal)December", -5.816366835403347),
-                                    ("Holiyear (latent)", -5.816366835403347),
+                                     -6.505036396541998),
+                                    ("at <time-of-day>intersect", -5.588745664667843),
+                                    ("Rosh Hashanahyear (latent)", -5.8118892159820525),
+                                    ("Dhanterasyear (latent)", -6.505036396541998),
+                                    ("Tu BiShvatyear (latent)", -6.505036396541998),
+                                    ("<day-of-month> (ordinal)December", -5.8118892159820525),
+                                    ("Holiyear (latent)", -5.8118892159820525),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.509514015963292),
-                                    ("Holika Dahanyear (latent)", -5.816366835403347),
+                                     -6.505036396541998),
+                                    ("Holika Dahanyear (latent)", -5.8118892159820525),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.104048907855128),
-                                    ("dayminute", -3.1596099286886874),
-                                    ("Mawlidyear (latent)", -6.509514015963292),
+                                     -6.099571288433833),
+                                    ("dayminute", -3.155132309267393),
+                                    ("Mawlidyear (latent)", -6.505036396541998),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.104048907855128),
+                                     -6.099571288433833),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.509514015963292),
-                                    ("Jumu'atul-Widayear (latent)", -5.593223284089137),
-                                    ("minuteday", -2.760009940032921),
+                                     -6.505036396541998),
+                                    ("Jumu'atul-Widayear (latent)", -5.588745664667843),
+                                    ("minuteday", -2.7555323206116267),
                                     ("absorption of , after named dayintersect",
-                                     -5.816366835403347),
-                                    ("intersectyear (latent)", -6.509514015963292),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.509514015963292),
+                                     -5.8118892159820525),
+                                    ("intersectyear (latent)", -6.505036396541998),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.505036396541998),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.509514015963292),
+                                     -6.505036396541998),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.509514015963292),
-                                    ("intersecthhhmm", -6.104048907855128),
+                                     -6.505036396541998),
+                                    ("intersecthhhmm", -6.099571288433833),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.509514015963292),
-                                    ("Mothering Sundayyear (latent)", -6.104048907855128),
-                                    ("Boss's Dayyear (latent)", -6.104048907855128),
+                                     -6.505036396541998),
+                                    ("Mothering Sundayyear (latent)", -6.099571288433833),
+                                    ("Boss's Dayyear (latent)", -6.099571288433833),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.509514015963292),
-                                    ("Global Youth Service Dayyear (latent)", -6.509514015963292),
-                                    ("Dhanterasin|during <named-month>|year", -6.509514015963292),
-                                    ("tonight<time-of-day> o'clock", -6.509514015963292),
-                                    ("Tisha B'Avyear (latent)", -6.509514015963292),
-                                    ("Isra and Mi'rajyear (latent)", -5.593223284089137),
-                                    ("at <time-of-day>on <day>", -4.900076103529192),
+                                     -6.505036396541998),
+                                    ("Global Youth Service Dayyear (latent)", -6.505036396541998),
+                                    ("Dhanterasin|during <named-month>|year", -6.505036396541998),
+                                    ("tonight<time-of-day> o'clock", -6.505036396541998),
+                                    ("Tisha B'Avyear (latent)", -6.505036396541998),
+                                    ("Isra and Mi'rajyear (latent)", -5.588745664667843),
+                                    ("at <time-of-day>on <day>", -4.895598484107897),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.104048907855128),
+                                     -6.099571288433833),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.816366835403347),
-                                    ("Christmasyear (latent)", -6.104048907855128),
-                                    ("Saturdayintersect", -6.509514015963292),
-                                    ("Naraka Chaturdashiyear (latent)", -6.104048907855128),
-                                    ("Thai Pongalin|during <named-month>|year", -6.509514015963292),
-                                    ("dayweek", -6.509514015963292),
-                                    ("Easter Sundayyear (latent)", -5.816366835403347),
+                                     -5.8118892159820525),
+                                    ("Christmasyear (latent)", -6.099571288433833),
+                                    ("Saturdayintersect", -6.505036396541998),
+                                    ("Naraka Chaturdashiyear (latent)", -6.099571288433833),
+                                    ("Thai Pongalin|during <named-month>|year", -6.505036396541998),
+                                    ("dayweek", -6.505036396541998),
+                                    ("Easter Sundayyear (latent)", -5.8118892159820525),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.104048907855128),
-                                    ("weekyear", -5.410901727295182),
-                                    ("King's Dayyear (latent)", -5.0054366191870185),
-                                    ("hh:mmin|during the <part-of-day>", -5.593223284089137),
+                                     -6.099571288433833),
+                                    ("weekyear", -5.406424107873888),
+                                    ("King's Dayyear (latent)", -5.000958999765723),
+                                    ("hh:mmin|during the <part-of-day>", -5.588745664667843),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.104048907855128),
+                                     -6.099571288433833),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.816366835403347),
-                                    ("Hanukkahyear (latent)", -5.816366835403347),
-                                    ("Rama Navamiyear (latent)", -6.509514015963292),
-                                    ("February<time> <part-of-day>", -6.509514015963292),
+                                     -5.8118892159820525),
+                                    ("Hanukkahyear (latent)", -5.8118892159820525),
+                                    ("Rama Navamiyear (latent)", -6.505036396541998),
+                                    ("February<time> <part-of-day>", -6.505036396541998),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.816366835403347),
-                                    ("Great Lentyear (latent)", -6.509514015963292),
-                                    ("tomorrowat <time-of-day>", -5.816366835403347),
+                                     -5.8118892159820525),
+                                    ("Great Lentyear (latent)", -6.505036396541998),
+                                    ("tomorrowat <time-of-day>", -5.8118892159820525),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.509514015963292),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.104048907855128),
-                                    ("Ugadiyear (latent)", -5.1232196548434015),
-                                    ("Vaisakhiyear (latent)", -5.816366835403347),
+                                     -6.505036396541998),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.099571288433833),
+                                    ("Ugadiyear (latent)", -5.118742035422107),
+                                    ("Vaisakhiyear (latent)", -5.8118892159820525),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.816366835403347),
-                                    ("last <cycle> of <time>year (latent)", -5.816366835403347),
-                                    ("at <time-of-day>tomorrow", -6.104048907855128),
-                                    ("tomorrow<time-of-day> am|pm", -6.509514015963292),
+                                     -5.8118892159820525),
+                                    ("last <cycle> of <time>year (latent)", -5.8118892159820525),
+                                    ("at <time-of-day>tomorrow", -6.099571288433833),
+                                    ("tomorrow<time-of-day> am|pm", -6.505036396541998),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.509514015963292),
-                                    ("Diwaliyear (latent)", -6.509514015963292),
-                                    ("between <time> and <time>on <day>", -6.104048907855128),
-                                    ("Black Fridayyear (latent)", -6.104048907855128),
+                                     -6.505036396541998),
+                                    ("Diwaliyear (latent)", -6.505036396541998),
+                                    ("between <time> and <time>on <day>", -6.099571288433833),
+                                    ("Black Fridayyear (latent)", -6.099571288433833),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.509514015963292),
+                                     -6.505036396541998),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.509514015963292),
-                                    ("Chhathyear (latent)", -6.104048907855128),
-                                    ("Vasant Panchamiyear (latent)", -6.509514015963292),
-                                    ("Rabindra Jayantiyear (latent)", -5.256751047467924),
-                                    ("this <part-of-day>at <time-of-day>", -5.256751047467924),
-                                    ("St Patrick's Dayyear (latent)", -6.509514015963292),
-                                    ("Thursday<time> (timezone)", -6.509514015963292),
+                                     -6.505036396541998),
+                                    ("Chhathyear (latent)", -6.099571288433833),
+                                    ("Vasant Panchamiyear (latent)", -6.505036396541998),
+                                    ("Rabindra Jayantiyear (latent)", -5.25227342804663),
+                                    ("this <part-of-day>at <time-of-day>", -5.25227342804663),
+                                    ("St Patrick's Dayyear (latent)", -6.505036396541998),
+                                    ("Thursday<time> (timezone)", -6.505036396541998),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.509514015963292),
-                                    ("Pargat Diwasyear (latent)", -5.256751047467924),
-                                    ("August Bank Holidayyear (latent)", -5.816366835403347),
-                                    ("<datetime> - <datetime> (interval)July", -6.104048907855128),
+                                     -6.505036396541998),
+                                    ("Pargat Diwasyear (latent)", -5.25227342804663),
+                                    ("August Bank Holidayyear (latent)", -5.8118892159820525),
+                                    ("<datetime> - <datetime> (interval)July", -6.099571288433833),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.816366835403347),
-                                    ("Februaryintersect", -6.509514015963292),
-                                    ("Simchat Torahyear (latent)", -6.509514015963292),
-                                    ("minuteyear", -6.509514015963292)],
+                                     -5.8118892159820525),
+                                    ("Februaryintersect", -6.505036396541998),
+                                    ("Simchat Torahyear (latent)", -6.505036396541998),
+                                    ("minuteyear", -6.505036396541998)],
                                n = 515},
                    koData =
-                     ClassData{prior = -0.936565725735566, unseen = -6.885509670034817,
+                     ClassData{prior = -0.9952120774851333, unseen = -6.815639990074332,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.687262074706563),
+                                   [("Thursdayhhhmm", -4.617318319923739),
                                     ("time-of-day (latent)<time-of-day> - <time-of-day> (interval)",
-                                     -5.785874363374673),
-                                    ("hourday", -3.5886497860384536),
+                                     -5.715930608591849),
+                                    ("hourday", -3.518706031255629),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.191339471482838),
-                                    ("<day-of-month> (ordinal)August", -6.191339471482838),
-                                    ("dayhour", -3.5171908220563086),
-                                    ("<time> timezoneyear (latent)", -5.498192290922892),
+                                     -6.121395716700013),
+                                    ("<day-of-month> (ordinal)August", -6.121395716700013),
+                                    ("dayhour", -3.447247067273484),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.275048739608683),
-                                    ("Tuesdayfrom|since|after <time>", -5.498192290922892),
-                                    ("daymonth", -3.4832892703806273),
-                                    ("hourquarter", -5.275048739608683),
-                                    ("monthyear", -4.93857650298747),
-                                    ("<time-of-day> am|pmyear (latent)", -5.498192290922892),
-                                    ("Thai Pongalyear (latent)", -5.498192290922892),
-                                    ("intersecthh:mm", -6.191339471482838),
+                                     -5.205104984825858),
+                                    ("Tuesdayfrom|since|after <time>", -5.428248536140067),
+                                    ("daymonth", -3.413345515597803),
+                                    ("hourquarter", -5.205104984825858),
+                                    ("monthyear", -4.868632748204645),
+                                    ("Thai Pongalyear (latent)", -5.428248536140067),
+                                    ("intersecthh:mm", -6.121395716700013),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.785874363374673),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.191339471482838),
-                                    ("houryear", -4.399580002254782),
+                                     -5.715930608591849),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.121395716700013),
+                                    ("houryear", -4.735101355580122),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.191339471482838),
-                                    ("<day-of-month> (ordinal)October", -6.191339471482838),
+                                     -6.121395716700013),
+                                    ("<day-of-month> (ordinal)October", -6.121395716700013),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.498192290922892),
-                                    ("hournograin", -4.93857650298747),
-                                    ("<time-of-day> am|pmintersect", -4.93857650298747),
-                                    ("Octoberyear (latent)", -6.191339471482838),
-                                    ("Good Fridayyear (latent)", -5.785874363374673),
+                                     -5.428248536140067),
+                                    ("hournograin", -4.868632748204645),
+                                    ("<time-of-day> am|pmintersect", -4.868632748204645),
+                                    ("Octoberyear (latent)", -6.121395716700013),
+                                    ("Good Fridayyear (latent)", -5.715930608591849),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.785874363374673),
-                                    ("early morningat <time-of-day>", -6.191339471482838),
-                                    ("until <time>on <day>", -5.498192290922892),
+                                     -5.715930608591849),
+                                    ("early morningat <time-of-day>", -6.121395716700013),
+                                    ("until <time>on <day>", -5.428248536140067),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.191339471482838),
-                                    ("time-of-day (latent)intersect", -5.498192290922892),
-                                    ("todayin <number> (implicit minutes)", -6.191339471482838),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.498192290922892),
+                                     -6.121395716700013),
+                                    ("time-of-day (latent)intersect", -5.428248536140067),
+                                    ("todayin <number> (implicit minutes)", -6.121395716700013),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.191339471482838),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.191339471482838),
-                                    ("hh:mmon <day>", -4.93857650298747),
-                                    ("hhhmmintersect", -5.785874363374673),
-                                    ("absorption of , after named dayJuly", -5.275048739608683),
-                                    ("from|since|after <time>July", -5.785874363374673),
+                                     -6.121395716700013),
+                                    ("hh:mmon <day>", -4.868632748204645),
+                                    ("hhhmmintersect", -5.715930608591849),
+                                    ("absorption of , after named dayJuly", -5.205104984825858),
+                                    ("from|since|after <time>July", -5.715930608591849),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.275048739608683),
-                                    ("Clean Mondayyear (latent)", -6.191339471482838),
-                                    ("monthhour", -6.191339471482838),
+                                     -5.205104984825858),
+                                    ("Clean Mondayyear (latent)", -6.121395716700013),
+                                    ("monthhour", -6.121395716700013),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.785874363374673),
-                                    ("hourmonth", -4.051273307986567),
-                                    ("todayat <time-of-day>", -6.191339471482838),
-                                    ("Bank Holidayyear (latent)", -5.498192290922892),
-                                    ("hhhmmyear (latent)", -4.93857650298747),
-                                    ("from|since|after <time>December", -6.191339471482838),
+                                     -5.715930608591849),
+                                    ("hourmonth", -3.9813295532037425),
+                                    ("todayat <time-of-day>", -6.121395716700013),
+                                    ("Bank Holidayyear (latent)", -5.428248536140067),
+                                    ("from|since|after <time>December", -6.121395716700013),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.191339471482838),
-                                    ("<time-of-day> am|pmon <day>", -4.93857650298747),
-                                    ("Mondayyear (latent)", -5.498192290922892),
-                                    ("dayday", -4.051273307986567),
-                                    ("dd/mmat <time-of-day>", -5.785874363374673),
-                                    ("on <day>September", -5.498192290922892),
-                                    ("time-of-day (latent)September", -5.785874363374673),
-                                    ("hourhour", -3.9400476728763425),
-                                    ("time-of-day (latent)on <day>", -4.687262074706563),
-                                    ("Thursdaydd/mm", -6.191339471482838),
+                                     -6.121395716700013),
+                                    ("<time-of-day> am|pmon <day>", -4.868632748204645),
+                                    ("Mondayyear (latent)", -5.428248536140067),
+                                    ("dayday", -3.9813295532037425),
+                                    ("dd/mmat <time-of-day>", -5.715930608591849),
+                                    ("on <day>September", -5.428248536140067),
+                                    ("time-of-day (latent)September", -5.715930608591849),
+                                    ("hourhour", -3.870103918093518),
+                                    ("time-of-day (latent)on <day>", -4.617318319923739),
+                                    ("Thursdaydd/mm", -6.121395716700013),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.785874363374673),
-                                    ("dayyear", -3.077824162272463),
-                                    ("New Year's Dayyear (latent)", -5.275048739608683),
-                                    ("time-of-day (latent)Sunday", -5.785874363374673),
-                                    ("Thursdayfrom|since|after <time>", -4.4865913792444125),
-                                    ("Thursdayat <time-of-day>", -4.581901559048737),
+                                     -5.715930608591849),
+                                    ("dayyear", -3.2310239588038483),
+                                    ("New Year's Dayyear (latent)", -5.205104984825858),
+                                    ("time-of-day (latent)Sunday", -5.715930608591849),
+                                    ("Thursdayfrom|since|after <time>", -4.4166476244615875),
+                                    ("Thursdayat <time-of-day>", -4.511957804265912),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.191339471482838),
-                                    ("Aprilyear (latent)", -6.191339471482838),
-                                    ("the <day-of-month> (ordinal)July", -6.191339471482838),
-                                    ("the <day-of-month> (number)July", -6.191339471482838),
-                                    ("monthminute", -6.191339471482838),
-                                    ("hourminute", -5.498192290922892),
-                                    ("<time-of-day> am|pmtomorrow", -5.785874363374673),
-                                    ("Thursdayhh:mm", -5.275048739608683),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.785874363374673),
-                                    ("minutemonth", -4.051273307986567),
-                                    ("time-of-day (latent)Friday", -5.785874363374673),
-                                    ("minutehour", -6.191339471482838),
-                                    ("part of daysat <time-of-day>", -5.092727182814728),
+                                     -6.121395716700013),
+                                    ("Aprilyear (latent)", -6.121395716700013),
+                                    ("the <day-of-month> (ordinal)July", -6.121395716700013),
+                                    ("the <day-of-month> (number)July", -6.121395716700013),
+                                    ("monthminute", -6.121395716700013),
+                                    ("hourminute", -5.428248536140067),
+                                    ("<time-of-day> am|pmtomorrow", -5.715930608591849),
+                                    ("Thursdayhh:mm", -5.205104984825858),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.715930608591849),
+                                    ("minutemonth", -3.9813295532037425),
+                                    ("time-of-day (latent)Friday", -5.715930608591849),
+                                    ("minutehour", -6.121395716700013),
+                                    ("part of daysat <time-of-day>", -5.022783428031904),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8399642143193597),
-                                    ("Augustyear (latent)", -5.785874363374673),
-                                    ("week-endin|during <named-month>|year", -6.191339471482838),
-                                    ("time-of-day (latent)Tuesday", -5.785874363374673),
+                                     -3.770020459536535),
+                                    ("Augustyear (latent)", -5.715930608591849),
+                                    ("week-endin|during <named-month>|year", -6.121395716700013),
+                                    ("time-of-day (latent)Tuesday", -5.715930608591849),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.191339471482838),
+                                     -6.121395716700013),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.191339471482838),
+                                     -6.121395716700013),
                                     ("dd/mm<time-of-day> - <time-of-day> (interval)",
-                                     -5.785874363374673),
-                                    ("Sundayyear (latent)", -5.275048739608683),
-                                    ("hourweek", -5.275048739608683),
-                                    ("the <day-of-month> (ordinal)Monday", -5.498192290922892),
-                                    ("Christmasat <time-of-day>", -6.191339471482838),
-                                    ("from|since|after <time>year (latent)", -5.092727182814728),
-                                    ("dd/mmyear (latent)", -6.191339471482838),
-                                    ("hhhmmon <day>", -5.275048739608683),
-                                    ("yesterday<time-of-day> am|pm", -6.191339471482838),
-                                    ("<day-of-month> (ordinal)July", -5.498192290922892),
+                                     -5.715930608591849),
+                                    ("Sundayyear (latent)", -5.205104984825858),
+                                    ("hourweek", -5.205104984825858),
+                                    ("the <day-of-month> (ordinal)Monday", -5.428248536140067),
+                                    ("Christmasat <time-of-day>", -6.121395716700013),
+                                    ("from|since|after <time>year (latent)", -5.715930608591849),
+                                    ("hhhmmon <day>", -5.205104984825858),
+                                    ("yesterday<time-of-day> am|pm", -6.121395716700013),
+                                    ("<day-of-month> (ordinal)July", -5.428248536140067),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.191339471482838),
+                                     -6.121395716700013),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.191339471482838),
+                                     -6.121395716700013),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.191339471482838),
-                                    ("at <time-of-day>intersect", -5.275048739608683),
-                                    ("hh:mmyear (latent)", -4.805045110362947),
-                                    ("Holiyear (latent)", -6.191339471482838),
-                                    ("until <time><time-of-day> am|pm", -6.191339471482838),
+                                     -6.121395716700013),
+                                    ("at <time-of-day>intersect", -5.205104984825858),
+                                    ("Holiyear (latent)", -6.121395716700013),
+                                    ("until <time><time-of-day> am|pm", -6.121395716700013),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.785874363374673),
-                                    ("dayminute", -3.329138590553369),
-                                    ("yyyy-mm-ddhh:mm", -5.785874363374673),
-                                    ("intersectfrom|since|after <time>", -5.785874363374673),
-                                    ("intersectSeptember", -4.319537294581246),
-                                    ("minuteday", -3.0343390503327243),
+                                     -5.715930608591849),
+                                    ("dayminute", -3.2591948357705447),
+                                    ("yyyy-mm-ddhh:mm", -5.715930608591849),
+                                    ("intersectfrom|since|after <time>", -5.715930608591849),
+                                    ("intersectSeptember", -4.249593539798422),
+                                    ("minuteday", -2.9643952955499),
                                     ("absorption of , after named dayintersect",
-                                     -6.191339471482838),
-                                    ("intersectyear (latent)", -6.191339471482838),
-                                    ("Februaryin|during the <part-of-day>", -6.191339471482838),
+                                     -6.121395716700013),
+                                    ("intersectyear (latent)", -6.121395716700013),
+                                    ("Februaryin|during the <part-of-day>", -6.121395716700013),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.191339471482838),
-                                    ("time-of-day (latent)July", -5.498192290922892),
-                                    ("Saturdayyear (latent)", -6.191339471482838),
+                                     -6.121395716700013),
+                                    ("time-of-day (latent)July", -5.428248536140067),
+                                    ("Saturdayyear (latent)", -6.121395716700013),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.191339471482838),
-                                    ("<day-of-month> (ordinal)Monday", -4.93857650298747),
-                                    ("at <time-of-day>on <day>", -5.275048739608683),
-                                    ("time-of-day (latent)<time-of-day> am|pm", -6.191339471482838),
-                                    ("absorption of , after named daySeptember", -4.93857650298747),
-                                    ("Naraka Chaturdashiyear (latent)", -6.191339471482838),
-                                    ("from|since|after <time>on <day>", -5.275048739608683),
-                                    ("dayweek", -6.191339471482838),
-                                    ("Easter Sundayyear (latent)", -5.785874363374673),
-                                    ("time-of-day (latent)at <time-of-day>", -5.498192290922892),
-                                    ("Thursday<time-of-day> am|pm", -4.93857650298747),
-                                    ("weekyear", -5.785874363374673),
-                                    ("time-of-day (latent)Thursday", -5.785874363374673),
+                                     -6.121395716700013),
+                                    ("<day-of-month> (ordinal)Monday", -4.868632748204645),
+                                    ("at <time-of-day>on <day>", -5.205104984825858),
+                                    ("time-of-day (latent)<time-of-day> am|pm", -6.121395716700013),
+                                    ("absorption of , after named daySeptember",
+                                     -4.868632748204645),
+                                    ("Naraka Chaturdashiyear (latent)", -6.121395716700013),
+                                    ("from|since|after <time>on <day>", -5.205104984825858),
+                                    ("dayweek", -6.121395716700013),
+                                    ("Easter Sundayyear (latent)", -5.715930608591849),
+                                    ("time-of-day (latent)at <time-of-day>", -5.428248536140067),
+                                    ("Thursday<time-of-day> am|pm", -4.868632748204645),
+                                    ("weekyear", -5.715930608591849),
+                                    ("time-of-day (latent)Thursday", -5.715930608591849),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.191339471482838),
-                                    ("<day-of-month> (ordinal)April", -6.191339471482838),
+                                     -6.121395716700013),
+                                    ("<day-of-month> (ordinal)April", -6.121395716700013),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.785874363374673),
+                                     -5.715930608591849),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.498192290922892),
-                                    ("Sundayfrom|since|after <time>", -6.191339471482838),
-                                    ("absorption of , after named dayFebruary", -5.275048739608683),
+                                     -5.428248536140067),
+                                    ("Sundayfrom|since|after <time>", -6.121395716700013),
+                                    ("absorption of , after named dayFebruary", -5.205104984825858),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.785874363374673),
+                                     -5.715930608591849),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.191339471482838),
-                                    ("tomorrowat <time-of-day>", -6.191339471482838),
-                                    ("daynograin", -5.785874363374673),
-                                    ("Fridayin|during <named-month>|year", -6.191339471482838),
+                                     -6.121395716700013),
+                                    ("tomorrowat <time-of-day>", -6.121395716700013),
+                                    ("daynograin", -5.715930608591849),
+                                    ("Fridayin|during <named-month>|year", -6.121395716700013),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.785874363374673),
-                                    ("last <cycle> of <time>year (latent)", -5.785874363374673),
-                                    ("tomorrow<time-of-day> am|pm", -6.191339471482838),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.498192290922892),
-                                    ("Diwaliyear (latent)", -5.785874363374673),
+                                     -5.715930608591849),
+                                    ("last <cycle> of <time>year (latent)", -5.715930608591849),
+                                    ("tomorrow<time-of-day> am|pm", -6.121395716700013),
+                                    ("Diwaliyear (latent)", -5.715930608591849),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.191339471482838),
-                                    ("this <part-of-day>at <time-of-day>", -5.275048739608683),
-                                    ("Fridayyear (latent)", -5.275048739608683),
-                                    ("time-of-day (latent)April", -6.191339471482838),
-                                    ("minuteyear", -3.9941148941466182)],
-                               n = 332}}),
+                                     -6.121395716700013),
+                                    ("this <part-of-day>at <time-of-day>", -5.205104984825858),
+                                    ("Fridayyear (latent)", -5.205104984825858),
+                                    ("time-of-day (latent)April", -6.121395716700013)],
+                               n = 302}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1765,22 +1754,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14398540805040755,
-                               unseen = -5.442417710521793,
+                     ClassData{prior = -4.329680575332419e-2,
+                               unseen = -5.438079308923196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.6433257068155483e-2),
-                                    ("intersect 2 numbers", -4.051784947803305)],
+                                   [("integer (numeric)", -2.2075951699199847e-2),
+                                    ("intersect 2 numbers", -4.047427642434349)],
                                n = 226},
                    koData =
-                     ClassData{prior = -2.0091723458332797,
-                               unseen = -3.6888794541139363,
+                     ClassData{prior = -3.1612467120315646, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.5841201044498106),
-                                    ("negative numbers", -0.40546510810816444),
-                                    ("compose by multiplication", -2.277267285009756)],
-                               n = 35}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("Bank Holiday",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
diff --git a/Duckling/Ranking/Classifiers/EN_IE.hs b/Duckling/Ranking/Classifiers/EN_IE.hs
index 22810d156..22057efad 100644
--- a/Duckling/Ranking/Classifiers/EN_IE.hs
+++ b/Duckling/Ranking/Classifiers/EN_IE.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
-                                    ("Thursdaydd/mm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
+                                    ("Thursdaydd/mm", -6.07993319509559),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/EN_IN.hs b/Duckling/Ranking/Classifiers/EN_IN.hs
index 2c5c92fed..2fea98ea0 100644
--- a/Duckling/Ranking/Classifiers/EN_IN.hs
+++ b/Duckling/Ranking/Classifiers/EN_IN.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
-                                    ("Thursdaydd/mm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
+                                    ("Thursdaydd/mm", -6.07993319509559),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/EN_JM.hs b/Duckling/Ranking/Classifiers/EN_JM.hs
index ef2943f92..5fee26210 100644
--- a/Duckling/Ranking/Classifiers/EN_JM.hs
+++ b/Duckling/Ranking/Classifiers/EN_JM.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
-                                    ("Thursdaydd/mm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
+                                    ("Thursdaydd/mm", -6.07993319509559),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/EN_NZ.hs b/Duckling/Ranking/Classifiers/EN_NZ.hs
index 1670e48b7..b2c8a8c82 100644
--- a/Duckling/Ranking/Classifiers/EN_NZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_NZ.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
-                                    ("Thursdaydd/mm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
+                                    ("Thursdaydd/mm", -6.07993319509559),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/EN_PH.hs b/Duckling/Ranking/Classifiers/EN_PH.hs
index 25cb00a01..7400f6500 100644
--- a/Duckling/Ranking/Classifiers/EN_PH.hs
+++ b/Duckling/Ranking/Classifiers/EN_PH.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("Thursdaymm/dd", -6.149536101678477),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("Thursdaymm/dd", -6.07993319509559),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
diff --git a/Duckling/Ranking/Classifiers/EN_TT.hs b/Duckling/Ranking/Classifiers/EN_TT.hs
index bd1f58ab5..3a494ea70 100644
--- a/Duckling/Ranking/Classifiers/EN_TT.hs
+++ b/Duckling/Ranking/Classifiers/EN_TT.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
-                                    ("Thursdaydd/mm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
+                                    ("Thursdaydd/mm", -6.07993319509559),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/EN_US.hs b/Duckling/Ranking/Classifiers/EN_US.hs
index 5aa65daef..ba1492353 100644
--- a/Duckling/Ranking/Classifiers/EN_US.hs
+++ b/Duckling/Ranking/Classifiers/EN_US.hs
@@ -292,7 +292,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.7147984280919266, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6945957207744071, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -313,47 +313,47 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.19845093872383832,
-                               unseen = -5.645446897643238,
+                     ClassData{prior = -0.2029408439966903,
+                               unseen = -5.6240175061873385,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.032469158504013),
-                                    ("week", -4.948759890378168),
+                                   [("<integer> to|till|before <hour-of-day>", -4.01096295328305),
+                                    ("week", -4.927253685157205),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.948759890378168),
-                                    ("today", -4.948759890378168),
-                                    ("intersect", -3.002849741322855),
-                                    ("year (latent)", -4.948759890378168),
-                                    ("<time> for <duration>", -4.255612709818223),
-                                    ("second", -4.948759890378168), ("now", -3.339321977944068),
-                                    ("tomorrow", -4.543294782270004),
-                                    ("this|last|next <cycle>", -4.543294782270004),
-                                    ("day", -1.791759469228055),
-                                    ("the <day-of-month> (ordinal)", -4.543294782270004),
-                                    ("the <day-of-month> (number)", -3.5624655292582776),
-                                    ("time-of-day (latent)", -2.5064128550089637),
-                                    ("year", -4.543294782270004),
-                                    ("<time-of-day> am|pm", -4.255612709818223),
-                                    ("hh:mm", -4.543294782270004), ("nograin", -3.339321977944068),
+                                     -4.927253685157205),
+                                    ("today", -4.927253685157205),
+                                    ("intersect", -3.2225055929187794),
+                                    ("year (latent)", -4.927253685157205),
+                                    ("<time> for <duration>", -4.23410650459726),
+                                    ("second", -4.927253685157205), ("now", -3.317815772723104),
+                                    ("tomorrow", -4.5217885770490405),
+                                    ("this|last|next <cycle>", -4.5217885770490405),
+                                    ("day", -1.8137383759468302),
+                                    ("the <day-of-month> (ordinal)", -4.5217885770490405),
+                                    ("the <day-of-month> (number)", -3.5409593240373143),
+                                    ("time-of-day (latent)", -2.4849066497880004),
+                                    ("year", -4.5217885770490405),
+                                    ("<time-of-day> am|pm", -4.23410650459726),
+                                    ("hh:mm", -4.5217885770490405), ("nograin", -3.317815772723104),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.543294782270004),
+                                     -4.5217885770490405),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.948759890378168),
-                                    ("<day-of-month> (ordinal)", -3.8501476017100584),
-                                    ("Easter Sunday", -4.948759890378168),
-                                    ("Christmas", -4.255612709818223),
-                                    ("hour", -2.3460702049337847), ("month", -4.948759890378168),
-                                    ("<datetime> - <datetime> (interval)", -2.751535313041949),
+                                     -4.927253685157205),
+                                    ("<day-of-month> (ordinal)", -3.828641396489095),
+                                    ("Easter Sunday", -4.927253685157205),
+                                    ("Christmas", -4.23410650459726), ("hour", -2.324563999712821),
+                                    ("month", -4.927253685157205),
+                                    ("<datetime> - <datetime> (interval)", -2.7300291078209855),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -3.002849741322855),
+                                     -2.981343536101891),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.543294782270004),
-                                    ("minute", -2.0043209112117277),
-                                    ("right now", -4.948759890378168),
-                                    ("<month> dd-dd (interval)", -4.255612709818223),
-                                    ("part of days", -4.948759890378168),
-                                    ("dd-dd <month> (interval)", -4.543294782270004)],
-                               n = 123}}),
+                                     -4.5217885770490405),
+                                    ("minute", -2.0094829530729257),
+                                    ("right now", -4.927253685157205),
+                                    ("<month> dd-dd (interval)", -4.23410650459726),
+                                    ("part of days", -4.927253685157205),
+                                    ("dd-dd <month> (interval)", -4.5217885770490405)],
+                               n = 120}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -1041,505 +1041,497 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.48146571675252064,
-                               unseen = -7.275172319452771,
+                     ClassData{prior = -0.44737150540954457,
+                               unseen = -7.271008538280992,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.581332378213926),
-                                    ("Father's Dayyear (latent)", -6.581332378213926),
-                                    ("Karva Chauthyear (latent)", -6.581332378213926),
+                                   [("Navaratriyear (latent)", -6.5771657055190795),
+                                    ("Father's Dayyear (latent)", -6.5771657055190795),
+                                    ("Karva Chauthyear (latent)", -6.5771657055190795),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.581332378213926),
-                                    ("Maha Shivaratriyear (latent)", -6.581332378213926),
-                                    ("Ramadanyear (latent)", -5.328569409718558),
+                                     -6.5771657055190795),
+                                    ("Maha Shivaratriyear (latent)", -6.5771657055190795),
+                                    ("Ramadanyear (latent)", -5.3244027370237115),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.195038017094035),
-                                    ("Military Spouse Dayyear (latent)", -6.581332378213926),
-                                    ("Bhai Doojyear (latent)", -6.581332378213926),
-                                    ("hourday", -4.566429357671661),
-                                    ("dayhour", -3.5368099404905027),
+                                     -5.190871344399189),
+                                    ("Military Spouse Dayyear (latent)", -6.5771657055190795),
+                                    ("Bhai Doojyear (latent)", -6.5771657055190795),
+                                    ("hourday", -4.562262684976815),
+                                    ("dayhour", -3.5326432677956565),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.195038017094035),
-                                    ("Martin Luther King's Dayyear (latent)", -6.175867270105761),
-                                    ("Shemini Atzeretyear (latent)", -6.581332378213926),
-                                    ("daymonth", -4.566429357671661),
-                                    ("monthday", -6.175867270105761),
-                                    ("monthyear", -4.78957290898587),
-                                    ("Yom Ha'atzmautyear (latent)", -6.581332378213926),
-                                    ("Orthodox Good Fridayyear (latent)", -6.175867270105761),
-                                    ("Vijayadashamiyear (latent)", -6.581332378213926),
+                                     -5.190871344399189),
+                                    ("Martin Luther King's Dayyear (latent)", -6.171700597410915),
+                                    ("Shemini Atzeretyear (latent)", -6.5771657055190795),
+                                    ("daymonth", -4.562262684976815),
+                                    ("monthday", -6.171700597410915),
+                                    ("monthyear", -4.785406236291025),
+                                    ("Yom Ha'atzmautyear (latent)", -6.5771657055190795),
+                                    ("Orthodox Good Fridayyear (latent)", -6.171700597410915),
+                                    ("Vijayadashamiyear (latent)", -6.5771657055190795),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -5.195038017094035),
-                                    ("Thanksgiving Dayyear (latent)", -5.482720089545816),
-                                    ("Thai Pongalyear (latent)", -5.88818519765398),
-                                    ("Thiru Onamyear (latent)", -5.88818519765398),
-                                    ("hhhmmabsorption of , after named day", -6.581332378213926),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.581332378213926),
+                                     -5.190871344399189),
+                                    ("Thanksgiving Dayyear (latent)", -5.47855341685097),
+                                    ("Thai Pongalyear (latent)", -5.884018524959134),
+                                    ("Thiru Onamyear (latent)", -5.884018524959134),
+                                    ("hhhmmabsorption of , after named day", -6.5771657055190795),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.5771657055190795),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.665041646339771),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.581332378213926),
-                                    ("Krishna Janmashtamiyear (latent)", -6.175867270105761),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.581332378213926),
-                                    ("houryear", -5.665041646339771),
+                                     -5.660874973644924),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.5771657055190795),
+                                    ("Krishna Janmashtamiyear (latent)", -6.171700597410915),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.5771657055190795),
+                                    ("houryear", -5.660874973644924),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.581332378213926),
-                                    ("Christmas<time-of-day> am|pm", -6.581332378213926),
+                                     -6.5771657055190795),
+                                    ("Christmas<time-of-day> am|pm", -6.5771657055190795),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.581332378213926),
+                                     -6.5771657055190795),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.88818519765398),
-                                    ("intersectin|during <named-month>|year", -6.581332378213926),
-                                    ("<time-of-day> am|pmintersect", -5.328569409718558),
-                                    ("Earth Houryear (latent)", -6.581332378213926),
-                                    ("Ganesh Chaturthiyear (latent)", -6.581332378213926),
-                                    ("Octoberyear (latent)", -5.077254981437651),
-                                    ("intersect<time-of-day> am|pm", -6.581332378213926),
-                                    ("Mattu Pongalyear (latent)", -6.581332378213926),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.581332378213926),
-                                    ("Daylight Saving Start Dayyear (latent)", -5.665041646339771),
-                                    ("Shavuotyear (latent)", -6.581332378213926),
-                                    ("Parsi New Yearyear (latent)", -5.665041646339771),
+                                     -5.884018524959134),
+                                    ("intersectin|during <named-month>|year", -6.5771657055190795),
+                                    ("<time-of-day> am|pmintersect", -5.3244027370237115),
+                                    ("Earth Houryear (latent)", -6.5771657055190795),
+                                    ("Ganesh Chaturthiyear (latent)", -6.5771657055190795),
+                                    ("Octoberyear (latent)", -5.073088308742806),
+                                    ("intersect<time-of-day> am|pm", -6.5771657055190795),
+                                    ("Mattu Pongalyear (latent)", -6.5771657055190795),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.5771657055190795),
+                                    ("Daylight Saving Start Dayyear (latent)", -5.660874973644924),
+                                    ("Shavuotyear (latent)", -6.5771657055190795),
+                                    ("Parsi New Yearyear (latent)", -5.660874973644924),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.581332378213926),
+                                     -6.5771657055190795),
                                     ("the <day-of-month> (ordinal)intersect by \",\", \"of\", \"from\" for year",
-                                     -6.581332378213926),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.581332378213926),
-                                    ("todayin|within|after <duration>", -6.581332378213926),
+                                     -6.5771657055190795),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.5771657055190795),
+                                    ("todayin|within|after <duration>", -6.5771657055190795),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.175867270105761),
-                                    ("Marchyear (latent)", -6.581332378213926),
+                                     -6.171700597410915),
+                                    ("Marchyear (latent)", -6.5771657055190795),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.175867270105761),
-                                    ("Sukkotyear (latent)", -6.175867270105761),
-                                    ("hhhmmintersect", -6.175867270105761),
+                                     -6.171700597410915),
+                                    ("Sukkotyear (latent)", -6.171700597410915),
+                                    ("hhhmmintersect", -6.171700597410915),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.175867270105761),
-                                    ("Daylight Saving End Dayyear (latent)", -5.665041646339771),
-                                    ("Clean Mondayyear (latent)", -6.175867270105761),
-                                    ("the <day-of-month> (ordinal)Sunday", -6.581332378213926),
-                                    ("monthhour", -6.175867270105761),
+                                     -6.171700597410915),
+                                    ("Daylight Saving End Dayyear (latent)", -5.660874973644924),
+                                    ("Clean Mondayyear (latent)", -6.171700597410915),
+                                    ("the <day-of-month> (ordinal)Sunday", -6.5771657055190795),
+                                    ("monthhour", -6.171700597410915),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.665041646339771),
-                                    ("todayat <time-of-day>", -6.581332378213926),
-                                    ("Thursday<time> timezone", -4.183437105415555),
-                                    ("tonight<time-of-day> am|pm", -6.581332378213926),
-                                    ("time-of-day (latent)tonight", -6.175867270105761),
-                                    ("from|since|after <time>December", -6.581332378213926),
+                                     -5.660874973644924),
+                                    ("todayat <time-of-day>", -6.5771657055190795),
+                                    ("Thursday<time> timezone", -4.179270432720709),
+                                    ("tonight<time-of-day> am|pm", -6.5771657055190795),
+                                    ("time-of-day (latent)tonight", -6.171700597410915),
+                                    ("from|since|after <time>December", -6.5771657055190795),
                                     ("Emergency Medical Services for Children Dayyear (latent)",
-                                     -6.581332378213926),
-                                    ("<time-of-day> am|pmon <day>", -4.566429357671661),
+                                     -6.5771657055190795),
+                                    ("<time-of-day> am|pmon <day>", -4.562262684976815),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.581332378213926),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.175867270105761),
-                                    ("Tax Daythis|last|next <cycle>", -6.581332378213926),
-                                    ("dayday", -3.7481190341577095),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.175867270105761),
-                                    ("mm/ddat <time-of-day>", -6.581332378213926),
-                                    ("tonightat <time-of-day>", -5.482720089545816),
+                                     -6.5771657055190795),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.171700597410915),
+                                    ("Tax Daythis|last|next <cycle>", -6.5771657055190795),
+                                    ("dayday", -3.7439523614628634),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.171700597410915),
+                                    ("mm/ddat <time-of-day>", -6.5771657055190795),
+                                    ("tonightat <time-of-day>", -5.47855341685097),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.88818519765398),
+                                     -5.884018524959134),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.581332378213926),
-                                    ("today<time-of-day> am|pm", -6.581332378213926),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.175867270105761),
-                                    ("at <time-of-day><time> <part-of-day>", -6.581332378213926),
-                                    ("<day-of-month> (ordinal)intersect", -6.175867270105761),
-                                    ("mm/dd<time-of-day> am|pm", -6.581332378213926),
-                                    ("hourhour", -3.6109179126442243),
-                                    ("Mahavir Jayantiyear (latent)", -6.175867270105761),
-                                    ("Navaratriin|during <named-month>|year", -6.581332378213926),
-                                    ("Wednesdaythis|last|next <cycle>", -6.581332378213926),
-                                    ("Lentyear (latent)", -6.581332378213926),
+                                     -6.5771657055190795),
+                                    ("today<time-of-day> am|pm", -6.5771657055190795),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.171700597410915),
+                                    ("at <time-of-day><time> <part-of-day>", -6.5771657055190795),
+                                    ("<day-of-month> (ordinal)intersect", -6.171700597410915),
+                                    ("mm/dd<time-of-day> am|pm", -6.5771657055190795),
+                                    ("hourhour", -3.6067512399493786),
+                                    ("Mahavir Jayantiyear (latent)", -6.171700597410915),
+                                    ("Navaratriin|during <named-month>|year", -6.5771657055190795),
+                                    ("Wednesdaythis|last|next <cycle>", -6.5771657055190795),
+                                    ("Lentyear (latent)", -6.5771657055190795),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.709530201312334),
-                                    ("Boghiyear (latent)", -6.581332378213926),
-                                    ("dayyear", -1.802208885102396),
+                                     -4.705363528617489),
+                                    ("Boghiyear (latent)", -6.5771657055190795),
+                                    ("dayyear", -1.7980422124075501),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.581332378213926),
-                                    ("Thursdayfrom|since|after <time>", -6.175867270105761),
+                                     -6.5771657055190795),
+                                    ("Thursdayfrom|since|after <time>", -6.171700597410915),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.581332378213926),
-                                    ("Thursdayat <time-of-day>", -5.88818519765398),
-                                    ("Islamic New Yearyear (latent)", -6.175867270105761),
-                                    ("Laylat al-Qadryear (latent)", -5.665041646339771),
-                                    ("part of days<time-of-day> am|pm", -6.581332378213926),
-                                    ("Shrove Tuesdayyear (latent)", -6.581332378213926),
+                                     -6.5771657055190795),
+                                    ("Thursdayat <time-of-day>", -5.884018524959134),
+                                    ("Islamic New Yearyear (latent)", -6.171700597410915),
+                                    ("Laylat al-Qadryear (latent)", -5.660874973644924),
+                                    ("part of days<time-of-day> am|pm", -6.5771657055190795),
+                                    ("Shrove Tuesdayyear (latent)", -6.5771657055190795),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.88818519765398),
-                                    ("hourminute", -6.175867270105761),
-                                    ("<time-of-day> am|pmtomorrow", -5.665041646339771),
-                                    ("Yom Kippuryear (latent)", -6.581332378213926),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.88818519765398),
-                                    ("<part-of-day> of <time>year (latent)", -6.581332378213926),
-                                    ("minutehour", -5.328569409718558),
-                                    ("Kaanum Pongalyear (latent)", -6.175867270105761),
-                                    ("Maha Saptamiyear (latent)", -6.581332378213926),
+                                     -5.884018524959134),
+                                    ("hourminute", -6.171700597410915),
+                                    ("<time-of-day> am|pmtomorrow", -5.660874973644924),
+                                    ("Yom Kippuryear (latent)", -6.5771657055190795),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.884018524959134),
+                                    ("<part-of-day> of <time>year (latent)", -6.5771657055190795),
+                                    ("minutehour", -5.3244027370237115),
+                                    ("Kaanum Pongalyear (latent)", -6.171700597410915),
+                                    ("Maha Saptamiyear (latent)", -6.5771657055190795),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.88818519765398),
-                                    ("time-of-day (latent)tomorrow", -5.665041646339771),
-                                    ("part of daysat <time-of-day>", -4.971894465779825),
+                                     -5.884018524959134),
+                                    ("time-of-day (latent)tomorrow", -5.660874973644924),
+                                    ("part of daysat <time-of-day>", -4.967727793084979),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.566429357671661),
-                                    ("for <duration> from <time>December", -6.581332378213926),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.581332378213926),
+                                     -4.562262684976815),
+                                    ("for <duration> from <time>December", -6.5771657055190795),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.5771657055190795),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.328569409718558),
+                                     -5.3244027370237115),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.328569409718558),
-                                    ("time-of-day (latent)this <part-of-day>", -6.581332378213926),
-                                    ("Pentecostyear (latent)", -6.581332378213926),
+                                     -5.3244027370237115),
+                                    ("time-of-day (latent)this <part-of-day>", -6.5771657055190795),
+                                    ("Pentecostyear (latent)", -6.5771657055190795),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.328569409718558),
-                                    ("<day-of-month> (ordinal)February", -6.581332378213926),
-                                    ("Eid al-Fitryear (latent)", -5.195038017094035),
+                                     -5.3244027370237115),
+                                    ("<day-of-month> (ordinal)February", -6.5771657055190795),
+                                    ("Eid al-Fitryear (latent)", -5.190871344399189),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.581332378213926),
-                                    ("Mini-Tuesday<duration> hence|ago", -6.581332378213926),
-                                    ("Mondayin|during the <part-of-day>", -6.581332378213926),
-                                    ("Chhathin|during <named-month>|year", -6.581332378213926),
-                                    ("Diwaliin|during <named-month>|year", -6.581332378213926),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.581332378213926),
-                                    ("Vaisakhiin|during <named-month>|year", -6.581332378213926),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.328569409718558),
-                                    ("Raksha Bandhanyear (latent)", -6.581332378213926),
-                                    ("daysecond", -6.175867270105761),
+                                     -6.5771657055190795),
+                                    ("Mini-Tuesday<duration> hence|ago", -6.5771657055190795),
+                                    ("Mondayin|during the <part-of-day>", -6.5771657055190795),
+                                    ("Chhathin|during <named-month>|year", -6.5771657055190795),
+                                    ("Diwaliin|during <named-month>|year", -6.5771657055190795),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.5771657055190795),
+                                    ("Vaisakhiin|during <named-month>|year", -6.5771657055190795),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.3244027370237115),
+                                    ("Raksha Bandhanyear (latent)", -6.5771657055190795),
+                                    ("daysecond", -6.171700597410915),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.175867270105761),
-                                    ("Emancipation Dayyear (latent)", -5.88818519765398),
-                                    ("Ratha-Yatrayear (latent)", -6.581332378213926),
-                                    ("Ashurayear (latent)", -6.581332378213926),
-                                    ("Tuesdayin|during <named-month>|year", -6.581332378213926),
-                                    ("Chinese New Yearyear (latent)", -6.581332378213926),
-                                    ("tomorrowintersect", -6.581332378213926),
-                                    ("Lag BaOmeryear (latent)", -6.581332378213926),
+                                     -6.171700597410915),
+                                    ("Emancipation Dayyear (latent)", -5.884018524959134),
+                                    ("Ratha-Yatrayear (latent)", -6.5771657055190795),
+                                    ("Ashurayear (latent)", -6.5771657055190795),
+                                    ("Tuesdayin|during <named-month>|year", -6.5771657055190795),
+                                    ("Chinese New Yearyear (latent)", -6.5771657055190795),
+                                    ("tomorrowintersect", -6.5771657055190795),
+                                    ("Lag BaOmeryear (latent)", -6.5771657055190795),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.581332378213926),
-                                    ("Eid al-Adhayear (latent)", -4.441266214717655),
-                                    ("intersectin|during the <part-of-day>", -6.581332378213926),
-                                    ("Palm Sundayyear (latent)", -6.581332378213926),
-                                    ("Christmasat <time-of-day>", -6.581332378213926),
-                                    ("Passoveryear (latent)", -6.581332378213926),
-                                    ("Lazarus Saturdayyear (latent)", -6.581332378213926),
+                                     -6.5771657055190795),
+                                    ("Eid al-Adhayear (latent)", -4.437099542022809),
+                                    ("intersectin|during the <part-of-day>", -6.5771657055190795),
+                                    ("Palm Sundayyear (latent)", -6.5771657055190795),
+                                    ("Christmasat <time-of-day>", -6.5771657055190795),
+                                    ("Passoveryear (latent)", -6.5771657055190795),
+                                    ("Lazarus Saturdayyear (latent)", -6.5771657055190795),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.581332378213926),
-                                    ("Cyber Mondayyear (latent)", -6.175867270105761),
-                                    ("hhhmmon <day>", -5.665041646339771),
-                                    ("Yom HaShoahyear (latent)", -6.175867270105761),
+                                     -6.5771657055190795),
+                                    ("Cyber Mondayyear (latent)", -6.171700597410915),
+                                    ("hhhmmon <day>", -5.660874973644924),
+                                    ("Yom HaShoahyear (latent)", -6.171700597410915),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.175867270105761),
+                                     -6.171700597410915),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.581332378213926),
-                                    ("Septemberyear (latent)", -6.175867270105761),
+                                     -6.5771657055190795),
+                                    ("Septemberyear (latent)", -6.171700597410915),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.077254981437651),
-                                    ("Halloweenyear (latent)", -6.581332378213926),
+                                     -5.073088308742806),
+                                    ("Halloweenyear (latent)", -6.5771657055190795),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.175867270105761),
+                                     -6.171700597410915),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.88818519765398),
+                                     -5.884018524959134),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.581332378213926),
-                                    ("at <time-of-day>intersect", -5.665041646339771),
-                                    ("Rosh Hashanahyear (latent)", -5.88818519765398),
-                                    ("Super Tuesdayyear (latent)", -5.665041646339771),
-                                    ("Dhanterasyear (latent)", -6.581332378213926),
-                                    ("Tu BiShvatyear (latent)", -6.581332378213926),
-                                    ("<day-of-month> (ordinal)December", -5.88818519765398),
-                                    ("Holiyear (latent)", -5.88818519765398),
+                                     -6.5771657055190795),
+                                    ("at <time-of-day>intersect", -5.660874973644924),
+                                    ("Rosh Hashanahyear (latent)", -5.884018524959134),
+                                    ("Super Tuesdayyear (latent)", -5.660874973644924),
+                                    ("Dhanterasyear (latent)", -6.5771657055190795),
+                                    ("Tu BiShvatyear (latent)", -6.5771657055190795),
+                                    ("<day-of-month> (ordinal)December", -5.884018524959134),
+                                    ("Holiyear (latent)", -5.884018524959134),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.581332378213926),
-                                    ("Holika Dahanyear (latent)", -5.88818519765398),
+                                     -6.5771657055190795),
+                                    ("Holika Dahanyear (latent)", -5.884018524959134),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.175867270105761),
-                                    ("dayminute", -3.231428290939321),
-                                    ("Mawlidyear (latent)", -6.581332378213926),
+                                     -6.171700597410915),
+                                    ("dayminute", -3.2272616182444747),
+                                    ("Mawlidyear (latent)", -6.5771657055190795),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.175867270105761),
+                                     -6.171700597410915),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.581332378213926),
-                                    ("Jumu'atul-Widayear (latent)", -5.665041646339771),
-                                    ("minuteday", -2.8318283022835544),
-                                    ("absorption of , after named dayintersect", -5.88818519765398),
-                                    ("intersectyear (latent)", -6.581332378213926),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.581332378213926),
+                                     -6.5771657055190795),
+                                    ("Jumu'atul-Widayear (latent)", -5.660874973644924),
+                                    ("minuteday", -2.8276616295887087),
+                                    ("absorption of , after named dayintersect",
+                                     -5.884018524959134),
+                                    ("intersectyear (latent)", -6.5771657055190795),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.5771657055190795),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.581332378213926),
+                                     -6.5771657055190795),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.581332378213926),
-                                    ("Mini-Tuesdayyear (latent)", -6.581332378213926),
-                                    ("intersecthhhmm", -6.175867270105761),
+                                     -6.5771657055190795),
+                                    ("Mini-Tuesdayyear (latent)", -6.5771657055190795),
+                                    ("intersecthhhmm", -6.171700597410915),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.581332378213926),
-                                    ("Boss's Dayyear (latent)", -6.175867270105761),
+                                     -6.5771657055190795),
+                                    ("Boss's Dayyear (latent)", -6.171700597410915),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.581332378213926),
-                                    ("Global Youth Service Dayyear (latent)", -6.581332378213926),
-                                    ("Dhanterasin|during <named-month>|year", -6.581332378213926),
+                                     -6.5771657055190795),
+                                    ("Global Youth Service Dayyear (latent)", -6.5771657055190795),
+                                    ("Dhanterasin|during <named-month>|year", -6.5771657055190795),
                                     ("Super Tuesdayin|during <named-month>|year",
-                                     -6.581332378213926),
-                                    ("tonight<time-of-day> o'clock", -6.581332378213926),
-                                    ("Tisha B'Avyear (latent)", -6.581332378213926),
-                                    ("Isra and Mi'rajyear (latent)", -5.665041646339771),
-                                    ("at <time-of-day>on <day>", -4.971894465779825),
+                                     -6.5771657055190795),
+                                    ("tonight<time-of-day> o'clock", -6.5771657055190795),
+                                    ("Tisha B'Avyear (latent)", -6.5771657055190795),
+                                    ("Isra and Mi'rajyear (latent)", -5.660874973644924),
+                                    ("at <time-of-day>on <day>", -4.967727793084979),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.175867270105761),
-                                    ("time-of-day (latent)<time> <part-of-day>", -5.88818519765398),
-                                    ("Christmasyear (latent)", -6.175867270105761),
-                                    ("Saturdayintersect", -6.581332378213926),
-                                    ("Naraka Chaturdashiyear (latent)", -6.175867270105761),
-                                    ("Thai Pongalin|during <named-month>|year", -6.581332378213926),
+                                     -6.171700597410915),
+                                    ("time-of-day (latent)<time> <part-of-day>",
+                                     -5.884018524959134),
+                                    ("Christmasyear (latent)", -6.171700597410915),
+                                    ("Saturdayintersect", -6.5771657055190795),
+                                    ("Naraka Chaturdashiyear (latent)", -6.171700597410915),
+                                    ("Thai Pongalin|during <named-month>|year",
+                                     -6.5771657055190795),
                                     ("Emergency Medical Services Weekyear (latent)",
-                                     -6.581332378213926),
-                                    ("dayweek", -6.581332378213926),
-                                    ("Easter Sundayyear (latent)", -5.88818519765398),
+                                     -6.5771657055190795),
+                                    ("dayweek", -6.5771657055190795),
+                                    ("Easter Sundayyear (latent)", -5.884018524959134),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.175867270105761),
-                                    ("weekyear", -5.482720089545816),
-                                    ("Super Tuesdaythis|last|next <cycle>", -6.581332378213926),
-                                    ("King's Dayyear (latent)", -5.077254981437651),
-                                    ("hh:mmin|during the <part-of-day>", -5.665041646339771),
+                                     -6.171700597410915),
+                                    ("weekyear", -5.47855341685097),
+                                    ("Super Tuesdaythis|last|next <cycle>", -6.5771657055190795),
+                                    ("King's Dayyear (latent)", -5.073088308742806),
+                                    ("hh:mmin|during the <part-of-day>", -5.660874973644924),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.175867270105761),
+                                     -6.171700597410915),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.88818519765398),
-                                    ("Hanukkahyear (latent)", -5.88818519765398),
-                                    ("Rama Navamiyear (latent)", -6.581332378213926),
-                                    ("February<time> <part-of-day>", -6.581332378213926),
-                                    ("National Grandparents Dayyear (latent)", -6.581332378213926),
+                                     -5.884018524959134),
+                                    ("Hanukkahyear (latent)", -5.884018524959134),
+                                    ("Rama Navamiyear (latent)", -6.5771657055190795),
+                                    ("February<time> <part-of-day>", -6.5771657055190795),
+                                    ("National Grandparents Dayyear (latent)", -6.5771657055190795),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.88818519765398),
-                                    ("Great Lentyear (latent)", -6.581332378213926),
-                                    ("tomorrowat <time-of-day>", -5.88818519765398),
+                                     -5.884018524959134),
+                                    ("Great Lentyear (latent)", -6.5771657055190795),
+                                    ("tomorrowat <time-of-day>", -5.884018524959134),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.581332378213926),
-                                    ("Labor Dayyear (latent)", -6.581332378213926),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.175867270105761),
-                                    ("Ugadiyear (latent)", -5.195038017094035),
-                                    ("Vaisakhiyear (latent)", -5.88818519765398),
+                                     -6.5771657055190795),
+                                    ("Labor Dayyear (latent)", -6.5771657055190795),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.171700597410915),
+                                    ("Ugadiyear (latent)", -5.190871344399189),
+                                    ("Vaisakhiyear (latent)", -5.884018524959134),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.88818519765398),
-                                    ("last <cycle> of <time>year (latent)", -5.88818519765398),
-                                    ("at <time-of-day>tomorrow", -6.175867270105761),
-                                    ("tomorrow<time-of-day> am|pm", -6.581332378213926),
-                                    ("President's Dayyear (latent)", -6.581332378213926),
+                                     -5.884018524959134),
+                                    ("last <cycle> of <time>year (latent)", -5.884018524959134),
+                                    ("at <time-of-day>tomorrow", -6.171700597410915),
+                                    ("tomorrow<time-of-day> am|pm", -6.5771657055190795),
+                                    ("President's Dayyear (latent)", -6.5771657055190795),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.581332378213926),
-                                    ("Diwaliyear (latent)", -6.581332378213926),
-                                    ("between <time> and <time>on <day>", -6.175867270105761),
-                                    ("Black Fridayyear (latent)", -6.175867270105761),
+                                     -6.5771657055190795),
+                                    ("Diwaliyear (latent)", -6.5771657055190795),
+                                    ("between <time> and <time>on <day>", -6.171700597410915),
+                                    ("Black Fridayyear (latent)", -6.171700597410915),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.581332378213926),
+                                     -6.5771657055190795),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.581332378213926),
-                                    ("Chhathyear (latent)", -6.175867270105761),
-                                    ("Vasant Panchamiyear (latent)", -6.581332378213926),
-                                    ("Tax Dayyear (latent)", -5.482720089545816),
-                                    ("Rabindra Jayantiyear (latent)", -5.328569409718558),
-                                    ("this <part-of-day>at <time-of-day>", -5.328569409718558),
-                                    ("St Patrick's Dayyear (latent)", -6.581332378213926),
-                                    ("Thursday<time> (timezone)", -6.581332378213926),
+                                     -6.5771657055190795),
+                                    ("Chhathyear (latent)", -6.171700597410915),
+                                    ("Vasant Panchamiyear (latent)", -6.5771657055190795),
+                                    ("Tax Dayyear (latent)", -5.47855341685097),
+                                    ("Rabindra Jayantiyear (latent)", -5.3244027370237115),
+                                    ("this <part-of-day>at <time-of-day>", -5.3244027370237115),
+                                    ("St Patrick's Dayyear (latent)", -6.5771657055190795),
+                                    ("Thursday<time> (timezone)", -6.5771657055190795),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.581332378213926),
-                                    ("Pargat Diwasyear (latent)", -5.328569409718558),
-                                    ("<datetime> - <datetime> (interval)July", -6.175867270105761),
+                                     -6.5771657055190795),
+                                    ("Pargat Diwasyear (latent)", -5.3244027370237115),
+                                    ("<datetime> - <datetime> (interval)July", -6.171700597410915),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.88818519765398),
-                                    ("Februaryintersect", -6.581332378213926),
-                                    ("Mother's Dayyear (latent)", -6.581332378213926),
-                                    ("Simchat Torahyear (latent)", -6.581332378213926),
-                                    ("minuteyear", -6.581332378213926)],
+                                     -5.884018524959134),
+                                    ("Februaryintersect", -6.5771657055190795),
+                                    ("Mother's Dayyear (latent)", -6.5771657055190795),
+                                    ("Simchat Torahyear (latent)", -6.5771657055190795),
+                                    ("minuteyear", -6.5771657055190795)],
                                n = 553},
                    koData =
-                     ClassData{prior = -0.9620129812122502, unseen = -6.92951677076365,
+                     ClassData{prior = -1.019726319122397, unseen = -6.862757913051402,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.731313240828446),
-                                    ("hourday", -3.6327009521603366),
+                                   [("Thursdayhhhmm", -4.664486763144511),
+                                    ("hourday", -3.5658744744764013),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.23539063760472),
-                                    ("<day-of-month> (ordinal)August", -6.23539063760472),
-                                    ("dayhour", -3.5612419881781916),
-                                    ("<time> timezoneyear (latent)", -5.5422434570447745),
+                                     -6.168564159920785),
+                                    ("<day-of-month> (ordinal)August", -6.168564159920785),
+                                    ("dayhour", -3.4944155104942562),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.319099905730565),
-                                    ("Tuesdayfrom|since|after <time>", -5.136778348936611),
-                                    ("daymonth", -3.5273404365025103),
-                                    ("hourquarter", -5.319099905730565),
-                                    ("monthyear", -4.982627669109352),
-                                    ("<time-of-day> am|pmyear (latent)", -5.5422434570447745),
-                                    ("Thai Pongalyear (latent)", -5.5422434570447745),
-                                    ("intersecthh:mm", -6.23539063760472),
+                                     -5.25227342804663),
+                                    ("Tuesdayfrom|since|after <time>", -5.069951871252675),
+                                    ("daymonth", -3.460513958818575),
+                                    ("hourquarter", -5.25227342804663),
+                                    ("monthyear", -4.915801191425417),
+                                    ("Thai Pongalyear (latent)", -5.47541697936084),
+                                    ("intersecthh:mm", -6.168564159920785),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.829925529496556),
-                                    ("<datetime> - <datetime> (interval)Sunday",
-                                     -5.829925529496556),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.23539063760472),
-                                    ("houryear", -4.443631168376665),
+                                     -5.76309905181262),
+                                    ("<datetime> - <datetime> (interval)Sunday", -5.76309905181262),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.168564159920785),
+                                    ("houryear", -4.782269798800894),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.23539063760472),
-                                    ("<day-of-month> (ordinal)October", -6.23539063760472),
+                                     -6.168564159920785),
+                                    ("<day-of-month> (ordinal)October", -6.168564159920785),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.5422434570447745),
-                                    ("hournograin", -4.982627669109352),
-                                    ("<time-of-day> am|pmintersect", -4.982627669109352),
-                                    ("Octoberyear (latent)", -6.23539063760472),
-                                    ("Good Fridayyear (latent)", -5.829925529496556),
+                                     -5.47541697936084),
+                                    ("hournograin", -4.915801191425417),
+                                    ("<time-of-day> am|pmintersect", -4.915801191425417),
+                                    ("Octoberyear (latent)", -6.168564159920785),
+                                    ("Good Fridayyear (latent)", -5.76309905181262),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.829925529496556),
-                                    ("early morningat <time-of-day>", -6.23539063760472),
-                                    ("until <time>on <day>", -5.5422434570447745),
+                                     -5.76309905181262),
+                                    ("early morningat <time-of-day>", -6.168564159920785),
+                                    ("until <time>on <day>", -5.47541697936084),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.23539063760472),
-                                    ("time-of-day (latent)intersect", -5.5422434570447745),
-                                    ("todayin <number> (implicit minutes)", -6.23539063760472),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.5422434570447745),
+                                     -6.168564159920785),
+                                    ("time-of-day (latent)intersect", -5.47541697936084),
+                                    ("todayin <number> (implicit minutes)", -6.168564159920785),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.23539063760472),
-                                    ("about|exactly <time-of-day>year (latent)", -6.23539063760472),
-                                    ("hh:mmon <day>", -4.982627669109352),
-                                    ("hhhmmintersect", -5.829925529496556),
-                                    ("absorption of , after named dayJuly", -5.319099905730565),
-                                    ("from|since|after <time>July", -5.829925529496556),
+                                     -6.168564159920785),
+                                    ("hh:mmon <day>", -4.915801191425417),
+                                    ("hhhmmintersect", -5.76309905181262),
+                                    ("absorption of , after named dayJuly", -5.25227342804663),
+                                    ("from|since|after <time>July", -5.76309905181262),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.319099905730565),
-                                    ("Clean Mondayyear (latent)", -6.23539063760472),
-                                    ("monthhour", -6.23539063760472),
+                                     -5.25227342804663),
+                                    ("Clean Mondayyear (latent)", -6.168564159920785),
+                                    ("monthhour", -6.168564159920785),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.829925529496556),
-                                    ("hourmonth", -4.095324474108449),
-                                    ("todayat <time-of-day>", -6.23539063760472),
-                                    ("hhhmmyear (latent)", -4.982627669109352),
-                                    ("from|since|after <time>December", -6.23539063760472),
+                                     -5.76309905181262),
+                                    ("hourmonth", -4.028497996424514),
+                                    ("todayat <time-of-day>", -6.168564159920785),
+                                    ("from|since|after <time>December", -6.168564159920785),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.23539063760472),
-                                    ("<time-of-day> am|pmon <day>", -4.982627669109352),
-                                    ("Mondayyear (latent)", -5.136778348936611),
-                                    ("dayday", -3.8840153804412427),
-                                    ("mm/ddat <time-of-day>", -5.829925529496556),
-                                    ("on <day>September", -5.5422434570447745),
-                                    ("time-of-day (latent)September", -5.829925529496556),
-                                    ("hourhour", -4.155949095924885),
-                                    ("time-of-day (latent)on <day>", -4.731313240828446),
+                                     -6.168564159920785),
+                                    ("<time-of-day> am|pmon <day>", -4.915801191425417),
+                                    ("Mondayyear (latent)", -5.069951871252675),
+                                    ("dayday", -3.8171889027573074),
+                                    ("mm/ddat <time-of-day>", -5.76309905181262),
+                                    ("on <day>September", -5.47541697936084),
+                                    ("time-of-day (latent)September", -5.76309905181262),
+                                    ("hourhour", -4.089122618240949),
+                                    ("time-of-day (latent)on <day>", -4.664486763144511),
                                     ("<datetime> - <datetime> (interval)year (latent)",
-                                     -6.23539063760472),
+                                     -6.168564159920785),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.829925529496556),
-                                    ("dayyear", -2.9031861274295165),
-                                    ("Thursdaymm/dd", -6.23539063760472),
-                                    ("New Year's Dayyear (latent)", -5.319099905730565),
-                                    ("Tuesdayyear (latent)", -5.136778348936611),
-                                    ("time-of-day (latent)Sunday", -5.829925529496556),
-                                    ("Thursdayfrom|since|after <time>", -4.5306425453662955),
-                                    ("Thursdayat <time-of-day>", -4.625952725170619),
+                                     -5.76309905181262),
+                                    ("dayyear", -3.0115637387706715),
+                                    ("Thursdaymm/dd", -6.168564159920785),
+                                    ("New Year's Dayyear (latent)", -5.25227342804663),
+                                    ("Tuesdayyear (latent)", -5.069951871252675),
+                                    ("time-of-day (latent)Sunday", -5.76309905181262),
+                                    ("Thursdayfrom|since|after <time>", -4.46381606768236),
+                                    ("Thursdayat <time-of-day>", -4.5591262474866845),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.23539063760472),
-                                    ("Aprilyear (latent)", -6.23539063760472),
-                                    ("the <day-of-month> (ordinal)July", -6.23539063760472),
-                                    ("the <day-of-month> (number)July", -6.23539063760472),
-                                    ("monthminute", -6.23539063760472),
-                                    ("<time-of-day> am|pmtomorrow", -5.829925529496556),
-                                    ("Thursdayhh:mm", -5.319099905730565),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.829925529496556),
-                                    ("minutemonth", -4.095324474108449),
-                                    ("time-of-day (latent)Friday", -5.829925529496556),
-                                    ("minutehour", -6.23539063760472),
-                                    ("Tuesdayin <number> (implicit minutes)", -6.23539063760472),
-                                    ("part of daysat <time-of-day>", -5.136778348936611),
+                                     -6.168564159920785),
+                                    ("Aprilyear (latent)", -6.168564159920785),
+                                    ("the <day-of-month> (ordinal)July", -6.168564159920785),
+                                    ("the <day-of-month> (number)July", -6.168564159920785),
+                                    ("monthminute", -6.168564159920785),
+                                    ("<time-of-day> am|pmtomorrow", -5.76309905181262),
+                                    ("Thursdayhh:mm", -5.25227342804663),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.76309905181262),
+                                    ("minutemonth", -4.028497996424514),
+                                    ("time-of-day (latent)Friday", -5.76309905181262),
+                                    ("minutehour", -6.168564159920785),
+                                    ("Tuesdayin <number> (implicit minutes)", -6.168564159920785),
+                                    ("part of daysat <time-of-day>", -5.069951871252675),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8840153804412427),
-                                    ("<day-of-month> (ordinal)Sunday", -6.23539063760472),
-                                    ("Augustyear (latent)", -5.829925529496556),
-                                    ("week-endin|during <named-month>|year", -6.23539063760472),
-                                    ("time-of-day (latent)Tuesday", -5.829925529496556),
+                                     -3.8171889027573074),
+                                    ("<day-of-month> (ordinal)Sunday", -6.168564159920785),
+                                    ("Augustyear (latent)", -5.76309905181262),
+                                    ("week-endin|during <named-month>|year", -6.168564159920785),
+                                    ("time-of-day (latent)Tuesday", -5.76309905181262),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\" for year",
-                                     -6.23539063760472),
+                                     -6.168564159920785),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.829925529496556),
+                                     -5.76309905181262),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.23539063760472),
+                                     -6.168564159920785),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.23539063760472),
-                                    ("Tuesdayin|during <named-month>|year", -6.23539063760472),
-                                    ("Sundayyear (latent)", -5.319099905730565),
-                                    ("hourweek", -5.319099905730565),
-                                    ("the <day-of-month> (ordinal)Monday", -5.5422434570447745),
-                                    ("Christmasat <time-of-day>", -6.23539063760472),
-                                    ("from|since|after <time>year (latent)", -5.136778348936611),
-                                    ("hhhmmon <day>", -5.319099905730565),
-                                    ("yesterday<time-of-day> am|pm", -6.23539063760472),
-                                    ("<day-of-month> (ordinal)July", -5.5422434570447745),
-                                    ("Tuesday<duration> hence|ago", -6.23539063760472),
+                                     -6.168564159920785),
+                                    ("Tuesdayin|during <named-month>|year", -6.168564159920785),
+                                    ("Sundayyear (latent)", -5.25227342804663),
+                                    ("hourweek", -5.25227342804663),
+                                    ("the <day-of-month> (ordinal)Monday", -5.47541697936084),
+                                    ("Christmasat <time-of-day>", -6.168564159920785),
+                                    ("from|since|after <time>year (latent)", -5.76309905181262),
+                                    ("hhhmmon <day>", -5.25227342804663),
+                                    ("yesterday<time-of-day> am|pm", -6.168564159920785),
+                                    ("<day-of-month> (ordinal)July", -5.47541697936084),
+                                    ("Tuesday<duration> hence|ago", -6.168564159920785),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.23539063760472),
-                                    ("mm/ddyear (latent)", -6.23539063760472),
+                                     -6.168564159920785),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.23539063760472),
+                                     -6.168564159920785),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.23539063760472),
-                                    ("Tuesdaythis|last|next <cycle>", -6.23539063760472),
-                                    ("at <time-of-day>intersect", -5.319099905730565),
-                                    ("hh:mmyear (latent)", -4.84909627648483),
-                                    ("Holiyear (latent)", -6.23539063760472),
-                                    ("until <time><time-of-day> am|pm", -6.23539063760472),
+                                     -6.168564159920785),
+                                    ("Tuesdaythis|last|next <cycle>", -6.168564159920785),
+                                    ("at <time-of-day>intersect", -5.25227342804663),
+                                    ("Holiyear (latent)", -6.168564159920785),
+                                    ("until <time><time-of-day> am|pm", -6.168564159920785),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.829925529496556),
-                                    ("dayminute", -3.3450188797085554),
-                                    ("yyyy-mm-ddhh:mm", -5.829925529496556),
-                                    ("intersectfrom|since|after <time>", -5.829925529496556),
-                                    ("intersectSeptember", -4.363588460703129),
-                                    ("minuteday", -3.078390216454607),
-                                    ("absorption of , after named dayintersect", -6.23539063760472),
-                                    ("intersectyear (latent)", -6.23539063760472),
-                                    ("Februaryin|during the <part-of-day>", -6.23539063760472),
+                                     -5.76309905181262),
+                                    ("dayminute", -3.2781924020246205),
+                                    ("yyyy-mm-ddhh:mm", -5.76309905181262),
+                                    ("intersectfrom|since|after <time>", -5.76309905181262),
+                                    ("intersectSeptember", -4.296761983019193),
+                                    ("minuteday", -3.0115637387706715),
+                                    ("absorption of , after named dayintersect",
+                                     -6.168564159920785),
+                                    ("intersectyear (latent)", -6.168564159920785),
+                                    ("Februaryin|during the <part-of-day>", -6.168564159920785),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.23539063760472),
-                                    ("time-of-day (latent)July", -5.5422434570447745),
-                                    ("Saturdayyear (latent)", -6.23539063760472),
+                                     -6.168564159920785),
+                                    ("time-of-day (latent)July", -5.47541697936084),
+                                    ("Saturdayyear (latent)", -6.168564159920785),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.23539063760472),
-                                    ("<day-of-month> (ordinal)Monday", -4.982627669109352),
-                                    ("at <time-of-day>on <day>", -5.319099905730565),
+                                     -6.168564159920785),
+                                    ("<day-of-month> (ordinal)Monday", -4.915801191425417),
+                                    ("at <time-of-day>on <day>", -5.25227342804663),
                                     ("absorption of , after named daySeptember",
-                                     -4.982627669109352),
-                                    ("Naraka Chaturdashiyear (latent)", -6.23539063760472),
-                                    ("from|since|after <time>on <day>", -5.319099905730565),
-                                    ("dayweek", -6.23539063760472),
-                                    ("Easter Sundayyear (latent)", -5.829925529496556),
-                                    ("Thursday<time-of-day> am|pm", -4.982627669109352),
-                                    ("weekyear", -5.829925529496556),
-                                    ("time-of-day (latent)Thursday", -5.829925529496556),
+                                     -4.915801191425417),
+                                    ("Naraka Chaturdashiyear (latent)", -6.168564159920785),
+                                    ("from|since|after <time>on <day>", -5.25227342804663),
+                                    ("dayweek", -6.168564159920785),
+                                    ("Easter Sundayyear (latent)", -5.76309905181262),
+                                    ("Thursday<time-of-day> am|pm", -4.915801191425417),
+                                    ("weekyear", -5.76309905181262),
+                                    ("time-of-day (latent)Thursday", -5.76309905181262),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.23539063760472),
-                                    ("<day-of-month> (ordinal)April", -6.23539063760472),
+                                     -6.168564159920785),
+                                    ("<day-of-month> (ordinal)April", -6.168564159920785),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.829925529496556),
+                                     -5.76309905181262),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.5422434570447745),
-                                    ("Sundayfrom|since|after <time>", -6.23539063760472),
-                                    ("absorption of , after named dayFebruary", -5.319099905730565),
+                                     -5.47541697936084),
+                                    ("Sundayfrom|since|after <time>", -6.168564159920785),
+                                    ("absorption of , after named dayFebruary", -5.25227342804663),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.829925529496556),
+                                     -5.76309905181262),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.23539063760472),
-                                    ("tomorrowat <time-of-day>", -6.23539063760472),
-                                    ("daynograin", -5.829925529496556),
-                                    ("Fridayin|during <named-month>|year", -6.23539063760472),
+                                     -6.168564159920785),
+                                    ("tomorrowat <time-of-day>", -6.168564159920785),
+                                    ("daynograin", -5.76309905181262),
+                                    ("Fridayin|during <named-month>|year", -6.168564159920785),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.829925529496556),
-                                    ("last <cycle> of <time>year (latent)", -5.829925529496556),
-                                    ("tomorrow<time-of-day> am|pm", -6.23539063760472),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.5422434570447745),
-                                    ("Diwaliyear (latent)", -5.829925529496556),
+                                     -5.76309905181262),
+                                    ("last <cycle> of <time>year (latent)", -5.76309905181262),
+                                    ("tomorrow<time-of-day> am|pm", -6.168564159920785),
+                                    ("Diwaliyear (latent)", -5.76309905181262),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.23539063760472),
-                                    ("this <part-of-day>at <time-of-day>", -5.319099905730565),
-                                    ("Fridayyear (latent)", -5.319099905730565),
-                                    ("Tuesdayin|within|after <duration>", -6.23539063760472),
-                                    ("time-of-day (latent)April", -6.23539063760472),
-                                    ("minuteyear", -4.038166060268501)],
-                               n = 342}}),
+                                     -6.168564159920785),
+                                    ("this <part-of-day>at <time-of-day>", -5.25227342804663),
+                                    ("Fridayyear (latent)", -5.25227342804663),
+                                    ("Tuesdayin|within|after <duration>", -6.168564159920785),
+                                    ("time-of-day (latent)April", -6.168564159920785)],
+                               n = 312}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1837,20 +1829,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.1244944702443703, unseen = -5.594711379601839,
+                     ClassData{prior = -3.7179003241754015e-2,
+                               unseen = -5.5909869805108565,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.2642476749759777e-2),
-                                    ("intersect 2 numbers", -4.204692619390966)],
+                                   [("integer (numeric)", -1.8904154639152723e-2),
+                                    ("intersect 2 numbers", -4.200954297280359)],
                                n = 264},
                    koData =
-                     ClassData{prior = -2.145095511901273, unseen = -3.6888794541139363,
+                     ClassData{prior = -3.3105430133940246, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.5841201044498106),
-                                    ("negative numbers", -0.40546510810816444),
-                                    ("compose by multiplication", -2.277267285009756)],
-                               n = 35}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
diff --git a/Duckling/Ranking/Classifiers/EN_XX.hs b/Duckling/Ranking/Classifiers/EN_XX.hs
index a2dc42100..955ecb675 100644
--- a/Duckling/Ranking/Classifiers/EN_XX.hs
+++ b/Duckling/Ranking/Classifiers/EN_XX.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.70810943994113, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6877697557040074, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,45 +297,43 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.19992526121220253,
-                               unseen = -5.638354669333745,
+                     ClassData{prior = -0.204483128596807, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.02535169073515),
-                                    ("week", -4.941642422609305),
+                                   [("<integer> to|till|before <hour-of-day>", -4.00369019395397),
+                                    ("week", -4.919980925828125),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.941642422609305),
-                                    ("today", -4.941642422609305),
-                                    ("intersect", -2.995732273553991),
-                                    ("<time> for <duration>", -4.248495242049359),
-                                    ("second", -4.941642422609305), ("now", -3.236894330370879),
-                                    ("tomorrow", -4.53617731450114),
-                                    ("this|last|next <cycle>", -4.941642422609305),
-                                    ("day", -1.784642001459191),
-                                    ("the <day-of-month> (ordinal)", -4.53617731450114),
-                                    ("the <day-of-month> (number)", -3.5553480614894135),
-                                    ("time-of-day (latent)", -2.4992953872401),
-                                    ("<time-of-day> am|pm", -4.248495242049359),
-                                    ("hh:mm", -4.53617731450114), ("nograin", -3.236894330370879),
+                                     -4.919980925828125),
+                                    ("today", -4.919980925828125), ("intersect", -3.2152328335897),
+                                    ("<time> for <duration>", -4.22683374526818),
+                                    ("second", -4.919980925828125), ("now", -3.2152328335897),
+                                    ("tomorrow", -4.5145158177199605),
+                                    ("this|last|next <cycle>", -4.919980925828125),
+                                    ("day", -1.8064656166177504),
+                                    ("the <day-of-month> (ordinal)", -4.5145158177199605),
+                                    ("the <day-of-month> (number)", -3.5336865647082343),
+                                    ("time-of-day (latent)", -2.477633890458921),
+                                    ("<time-of-day> am|pm", -4.22683374526818),
+                                    ("hh:mm", -4.5145158177199605), ("nograin", -3.2152328335897),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.53617731450114),
+                                     -4.5145158177199605),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.941642422609305),
-                                    ("<day-of-month> (ordinal)", -3.8430301339411947),
-                                    ("Easter Sunday", -4.941642422609305),
-                                    ("Christmas", -4.248495242049359),
-                                    ("hour", -2.3389527371649206), ("month", -4.941642422609305),
-                                    ("<datetime> - <datetime> (interval)", -2.744417845273085),
+                                     -4.919980925828125),
+                                    ("<day-of-month> (ordinal)", -3.821368637160015),
+                                    ("Easter Sunday", -4.919980925828125),
+                                    ("Christmas", -4.22683374526818), ("hour", -2.317291240383741),
+                                    ("month", -4.919980925828125),
+                                    ("<datetime> - <datetime> (interval)", -2.7227563484919055),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.995732273553991),
+                                     -2.9740707767728116),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.53617731450114),
-                                    ("minute", -1.9972034434428638),
-                                    ("right now", -4.941642422609305),
-                                    ("<month> dd-dd (interval)", -4.248495242049359),
-                                    ("part of days", -4.941642422609305),
-                                    ("dd-dd <month> (interval)", -4.53617731450114)],
-                               n = 122}}),
+                                     -4.5145158177199605),
+                                    ("minute", -2.0022101937438457),
+                                    ("right now", -4.919980925828125),
+                                    ("<month> dd-dd (interval)", -4.22683374526818),
+                                    ("part of days", -4.919980925828125),
+                                    ("dd-dd <month> (interval)", -4.5145158177199605)],
+                               n = 119}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -997,469 +995,457 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4896732487607639, unseen = -7.199678345691172,
+                     ClassData{prior = -0.45216128863385024,
+                               unseen = -7.195187320178708,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.505784060128229),
-                                    ("Karva Chauthyear (latent)", -6.505784060128229),
+                                   [("Navaratriyear (latent)", -6.501289670540389),
+                                    ("Karva Chauthyear (latent)", -6.501289670540389),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.505784060128229),
-                                    ("Maha Shivaratriyear (latent)", -6.505784060128229),
-                                    ("Ramadanyear (latent)", -5.253021091632861),
+                                     -6.501289670540389),
+                                    ("Maha Shivaratriyear (latent)", -6.501289670540389),
+                                    ("Ramadanyear (latent)", -5.248526702045021),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.119489699008338),
-                                    ("Bhai Doojyear (latent)", -6.505784060128229),
-                                    ("hourday", -4.490881039585964),
-                                    ("dayhour", -3.4612616224048054),
+                                     -5.1149953094204985),
+                                    ("Bhai Doojyear (latent)", -6.501289670540389),
+                                    ("hourday", -4.486386649998124),
+                                    ("dayhour", -3.4567672328169663),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.119489699008338),
-                                    ("Martin Luther King's Dayyear (latent)", -6.100318952020064),
-                                    ("Shemini Atzeretyear (latent)", -6.505784060128229),
-                                    ("daymonth", -4.365717896631958),
-                                    ("monthday", -6.100318952020064),
-                                    ("monthyear", -4.633981883226637),
-                                    ("Yom Ha'atzmautyear (latent)", -6.505784060128229),
-                                    ("Orthodox Good Fridayyear (latent)", -6.100318952020064),
-                                    ("Vijayadashamiyear (latent)", -6.505784060128229),
-                                    ("Thanksgiving Dayyear (latent)", -5.407171771460119),
-                                    ("Thai Pongalyear (latent)", -5.8126368795682835),
-                                    ("Thiru Onamyear (latent)", -5.8126368795682835),
-                                    ("hhhmmabsorption of , after named day", -6.505784060128229),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.505784060128229),
+                                     -5.1149953094204985),
+                                    ("Martin Luther King's Dayyear (latent)", -6.095824562432225),
+                                    ("Shemini Atzeretyear (latent)", -6.501289670540389),
+                                    ("daymonth", -4.3612235070441185),
+                                    ("monthday", -6.095824562432225),
+                                    ("monthyear", -4.6294874936387975),
+                                    ("Yom Ha'atzmautyear (latent)", -6.501289670540389),
+                                    ("Orthodox Good Fridayyear (latent)", -6.095824562432225),
+                                    ("Vijayadashamiyear (latent)", -6.501289670540389),
+                                    ("Thanksgiving Dayyear (latent)", -5.402677381872279),
+                                    ("Thai Pongalyear (latent)", -5.808142489980444),
+                                    ("Thiru Onamyear (latent)", -5.808142489980444),
+                                    ("hhhmmabsorption of , after named day", -6.501289670540389),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.501289670540389),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.589493328254074),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.505784060128229),
-                                    ("Krishna Janmashtamiyear (latent)", -6.100318952020064),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.505784060128229),
-                                    ("houryear", -5.589493328254074),
+                                     -5.584998938666234),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.501289670540389),
+                                    ("Krishna Janmashtamiyear (latent)", -6.095824562432225),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.501289670540389),
+                                    ("houryear", -5.584998938666234),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.505784060128229),
-                                    ("Christmas<time-of-day> am|pm", -6.505784060128229),
-                                    ("<day-of-month> (ordinal)October", -6.505784060128229),
+                                     -6.501289670540389),
+                                    ("Christmas<time-of-day> am|pm", -6.501289670540389),
+                                    ("<day-of-month> (ordinal)October", -6.501289670540389),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.505784060128229),
+                                     -6.501289670540389),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.8126368795682835),
-                                    ("intersectin|during <named-month>|year", -6.505784060128229),
-                                    ("<time-of-day> am|pmintersect", -5.253021091632861),
-                                    ("Earth Houryear (latent)", -6.505784060128229),
-                                    ("Ganesh Chaturthiyear (latent)", -6.505784060128229),
-                                    ("Octoberyear (latent)", -4.896346147694128),
-                                    ("intersect<time-of-day> am|pm", -6.505784060128229),
-                                    ("Mattu Pongalyear (latent)", -6.505784060128229),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.505784060128229),
-                                    ("Shavuotyear (latent)", -6.505784060128229),
-                                    ("Parsi New Yearyear (latent)", -5.589493328254074),
+                                     -5.808142489980444),
+                                    ("intersectin|during <named-month>|year", -6.501289670540389),
+                                    ("<time-of-day> am|pmintersect", -5.248526702045021),
+                                    ("Earth Houryear (latent)", -6.501289670540389),
+                                    ("Ganesh Chaturthiyear (latent)", -6.501289670540389),
+                                    ("Octoberyear (latent)", -4.891851758106289),
+                                    ("intersect<time-of-day> am|pm", -6.501289670540389),
+                                    ("Mattu Pongalyear (latent)", -6.501289670540389),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.501289670540389),
+                                    ("Shavuotyear (latent)", -6.501289670540389),
+                                    ("Parsi New Yearyear (latent)", -5.584998938666234),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.505784060128229),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.505784060128229),
-                                    ("todayin|within|after <duration>", -6.505784060128229),
+                                     -6.501289670540389),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.501289670540389),
+                                    ("todayin|within|after <duration>", -6.501289670540389),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.100318952020064),
-                                    ("Marchyear (latent)", -6.505784060128229),
+                                     -6.095824562432225),
+                                    ("Marchyear (latent)", -6.501289670540389),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.100318952020064),
-                                    ("Sukkotyear (latent)", -6.100318952020064),
-                                    ("hhhmmintersect", -6.100318952020064),
+                                     -6.095824562432225),
+                                    ("Sukkotyear (latent)", -6.095824562432225),
+                                    ("hhhmmintersect", -6.095824562432225),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.100318952020064),
-                                    ("Clean Mondayyear (latent)", -6.100318952020064),
-                                    ("monthhour", -6.100318952020064),
+                                     -6.095824562432225),
+                                    ("Clean Mondayyear (latent)", -6.095824562432225),
+                                    ("monthhour", -6.095824562432225),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.589493328254074),
-                                    ("todayat <time-of-day>", -6.505784060128229),
-                                    ("Thursday<time> timezone", -4.107888787329858),
-                                    ("tonight<time-of-day> am|pm", -6.505784060128229),
-                                    ("time-of-day (latent)tonight", -6.100318952020064),
-                                    ("from|since|after <time>December", -6.505784060128229),
-                                    ("<time-of-day> am|pmon <day>", -4.490881039585964),
+                                     -5.584998938666234),
+                                    ("todayat <time-of-day>", -6.501289670540389),
+                                    ("Thursday<time> timezone", -4.103394397742019),
+                                    ("tonight<time-of-day> am|pm", -6.501289670540389),
+                                    ("time-of-day (latent)tonight", -6.095824562432225),
+                                    ("from|since|after <time>December", -6.501289670540389),
+                                    ("<time-of-day> am|pmon <day>", -4.486386649998124),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.505784060128229),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.100318952020064),
-                                    ("dayday", -3.7331953378884473),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.100318952020064),
-                                    ("mm/ddat <time-of-day>", -5.8126368795682835),
-                                    ("tonightat <time-of-day>", -5.407171771460119),
+                                     -6.501289670540389),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.095824562432225),
+                                    ("dayday", -3.7287009483006077),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.095824562432225),
+                                    ("mm/ddat <time-of-day>", -5.808142489980444),
+                                    ("tonightat <time-of-day>", -5.402677381872279),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.8126368795682835),
+                                     -5.808142489980444),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.505784060128229),
-                                    ("today<time-of-day> am|pm", -6.505784060128229),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.100318952020064),
-                                    ("at <time-of-day><time> <part-of-day>", -6.505784060128229),
-                                    ("<day-of-month> (ordinal)intersect", -5.8126368795682835),
-                                    ("mm/dd<time-of-day> am|pm", -6.505784060128229),
-                                    ("hourhour", -3.5353695945585275),
-                                    ("Mahavir Jayantiyear (latent)", -6.100318952020064),
-                                    ("Navaratriin|during <named-month>|year", -6.505784060128229),
-                                    ("Wednesdaythis|last|next <cycle>", -6.505784060128229),
-                                    ("Lentyear (latent)", -6.505784060128229),
+                                     -6.501289670540389),
+                                    ("today<time-of-day> am|pm", -6.501289670540389),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.095824562432225),
+                                    ("at <time-of-day><time> <part-of-day>", -6.501289670540389),
+                                    ("<day-of-month> (ordinal)intersect", -5.808142489980444),
+                                    ("mm/dd<time-of-day> am|pm", -6.501289670540389),
+                                    ("hourhour", -3.530875204970688),
+                                    ("Mahavir Jayantiyear (latent)", -6.095824562432225),
+                                    ("Navaratriin|during <named-month>|year", -6.501289670540389),
+                                    ("Wednesdaythis|last|next <cycle>", -6.501289670540389),
+                                    ("Lentyear (latent)", -6.501289670540389),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.633981883226637),
-                                    ("Boghiyear (latent)", -6.505784060128229),
-                                    ("dayyear", -1.9106642099936384),
+                                     -4.6294874936387975),
+                                    ("Boghiyear (latent)", -6.501289670540389),
+                                    ("dayyear", -1.906169820405799),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.505784060128229),
-                                    ("Thursdayfrom|since|after <time>", -6.100318952020064),
+                                     -6.501289670540389),
+                                    ("Thursdayfrom|since|after <time>", -6.095824562432225),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.505784060128229),
-                                    ("Thursdayat <time-of-day>", -5.8126368795682835),
-                                    ("Islamic New Yearyear (latent)", -6.100318952020064),
-                                    ("Laylat al-Qadryear (latent)", -5.589493328254074),
-                                    ("part of days<time-of-day> am|pm", -6.505784060128229),
-                                    ("Shrove Tuesdayyear (latent)", -6.505784060128229),
+                                     -6.501289670540389),
+                                    ("Thursdayat <time-of-day>", -5.808142489980444),
+                                    ("Islamic New Yearyear (latent)", -6.095824562432225),
+                                    ("Laylat al-Qadryear (latent)", -5.584998938666234),
+                                    ("part of days<time-of-day> am|pm", -6.501289670540389),
+                                    ("Shrove Tuesdayyear (latent)", -6.501289670540389),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.8126368795682835),
-                                    ("hourminute", -6.100318952020064),
-                                    ("<time-of-day> am|pmtomorrow", -5.589493328254074),
-                                    ("Yom Kippuryear (latent)", -6.505784060128229),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.8126368795682835),
-                                    ("<part-of-day> of <time>year (latent)", -6.505784060128229),
-                                    ("minutehour", -5.253021091632861),
-                                    ("Kaanum Pongalyear (latent)", -6.100318952020064),
-                                    ("Maha Saptamiyear (latent)", -6.505784060128229),
+                                     -5.808142489980444),
+                                    ("hourminute", -6.095824562432225),
+                                    ("<time-of-day> am|pmtomorrow", -5.584998938666234),
+                                    ("Yom Kippuryear (latent)", -6.501289670540389),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.808142489980444),
+                                    ("<part-of-day> of <time>year (latent)", -6.501289670540389),
+                                    ("minutehour", -5.248526702045021),
+                                    ("Kaanum Pongalyear (latent)", -6.095824562432225),
+                                    ("Maha Saptamiyear (latent)", -6.501289670540389),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.8126368795682835),
-                                    ("time-of-day (latent)tomorrow", -5.589493328254074),
-                                    ("part of daysat <time-of-day>", -4.896346147694128),
+                                     -5.808142489980444),
+                                    ("time-of-day (latent)tomorrow", -5.584998938666234),
+                                    ("part of daysat <time-of-day>", -4.891851758106289),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.490881039585964),
-                                    ("for <duration> from <time>December", -6.505784060128229),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.505784060128229),
+                                     -4.486386649998124),
+                                    ("for <duration> from <time>December", -6.501289670540389),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.501289670540389),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.253021091632861),
+                                     -5.248526702045021),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.253021091632861),
-                                    ("time-of-day (latent)this <part-of-day>", -6.505784060128229),
-                                    ("Pentecostyear (latent)", -6.505784060128229),
+                                     -5.248526702045021),
+                                    ("time-of-day (latent)this <part-of-day>", -6.501289670540389),
+                                    ("Pentecostyear (latent)", -6.501289670540389),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.253021091632861),
-                                    ("<day-of-month> (ordinal)February", -6.505784060128229),
-                                    ("Eid al-Fitryear (latent)", -5.119489699008338),
+                                     -5.248526702045021),
+                                    ("<day-of-month> (ordinal)February", -6.501289670540389),
+                                    ("Eid al-Fitryear (latent)", -5.1149953094204985),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.505784060128229),
-                                    ("Mondayin|during the <part-of-day>", -6.505784060128229),
-                                    ("Chhathin|during <named-month>|year", -6.505784060128229),
-                                    ("Diwaliin|during <named-month>|year", -6.505784060128229),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.505784060128229),
-                                    ("Vaisakhiin|during <named-month>|year", -6.505784060128229),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.253021091632861),
-                                    ("Raksha Bandhanyear (latent)", -6.505784060128229),
-                                    ("daysecond", -6.100318952020064),
+                                     -6.501289670540389),
+                                    ("Mondayin|during the <part-of-day>", -6.501289670540389),
+                                    ("Chhathin|during <named-month>|year", -6.501289670540389),
+                                    ("Diwaliin|during <named-month>|year", -6.501289670540389),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.501289670540389),
+                                    ("Vaisakhiin|during <named-month>|year", -6.501289670540389),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.248526702045021),
+                                    ("Raksha Bandhanyear (latent)", -6.501289670540389),
+                                    ("daysecond", -6.095824562432225),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.100318952020064),
-                                    ("Ratha-Yatrayear (latent)", -6.505784060128229),
-                                    ("Ashurayear (latent)", -6.505784060128229),
-                                    ("Tuesdayin|during <named-month>|year", -6.505784060128229),
-                                    ("Chinese New Yearyear (latent)", -6.505784060128229),
-                                    ("tomorrowintersect", -6.505784060128229),
-                                    ("Lag BaOmeryear (latent)", -6.505784060128229),
+                                     -6.095824562432225),
+                                    ("Ratha-Yatrayear (latent)", -6.501289670540389),
+                                    ("Ashurayear (latent)", -6.501289670540389),
+                                    ("Tuesdayin|during <named-month>|year", -6.501289670540389),
+                                    ("Chinese New Yearyear (latent)", -6.501289670540389),
+                                    ("tomorrowintersect", -6.501289670540389),
+                                    ("Lag BaOmeryear (latent)", -6.501289670540389),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.505784060128229),
-                                    ("Eid al-Adhayear (latent)", -4.365717896631958),
-                                    ("intersectin|during the <part-of-day>", -6.505784060128229),
-                                    ("Palm Sundayyear (latent)", -6.505784060128229),
-                                    ("Christmasat <time-of-day>", -6.505784060128229),
-                                    ("Passoveryear (latent)", -6.505784060128229),
-                                    ("Lazarus Saturdayyear (latent)", -6.505784060128229),
+                                     -6.501289670540389),
+                                    ("Eid al-Adhayear (latent)", -4.3612235070441185),
+                                    ("intersectin|during the <part-of-day>", -6.501289670540389),
+                                    ("Palm Sundayyear (latent)", -6.501289670540389),
+                                    ("Christmasat <time-of-day>", -6.501289670540389),
+                                    ("Passoveryear (latent)", -6.501289670540389),
+                                    ("Lazarus Saturdayyear (latent)", -6.501289670540389),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.100318952020064),
-                                    ("hhhmmon <day>", -5.589493328254074),
-                                    ("Yom HaShoahyear (latent)", -6.100318952020064),
+                                     -6.095824562432225),
+                                    ("hhhmmon <day>", -5.584998938666234),
+                                    ("Yom HaShoahyear (latent)", -6.095824562432225),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.100318952020064),
+                                     -6.095824562432225),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.505784060128229),
-                                    ("Septemberyear (latent)", -6.100318952020064),
+                                     -6.501289670540389),
+                                    ("Septemberyear (latent)", -6.095824562432225),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.001706663351954),
-                                    ("Halloweenyear (latent)", -6.505784060128229),
+                                     -4.997212273764115),
+                                    ("Halloweenyear (latent)", -6.501289670540389),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.100318952020064),
+                                     -6.095824562432225),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.8126368795682835),
+                                     -5.808142489980444),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.505784060128229),
-                                    ("at <time-of-day>intersect", -5.589493328254074),
-                                    ("Rosh Hashanahyear (latent)", -5.8126368795682835),
-                                    ("Dhanterasyear (latent)", -6.505784060128229),
-                                    ("Tu BiShvatyear (latent)", -6.505784060128229),
-                                    ("<day-of-month> (ordinal)December", -5.8126368795682835),
-                                    ("Holiyear (latent)", -5.8126368795682835),
+                                     -6.501289670540389),
+                                    ("at <time-of-day>intersect", -5.584998938666234),
+                                    ("Rosh Hashanahyear (latent)", -5.808142489980444),
+                                    ("Dhanterasyear (latent)", -6.501289670540389),
+                                    ("Tu BiShvatyear (latent)", -6.501289670540389),
+                                    ("<day-of-month> (ordinal)December", -5.808142489980444),
+                                    ("Holiyear (latent)", -5.808142489980444),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.505784060128229),
-                                    ("Holika Dahanyear (latent)", -5.8126368795682835),
+                                     -6.501289670540389),
+                                    ("Holika Dahanyear (latent)", -5.808142489980444),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.100318952020064),
-                                    ("dayminute", -3.121393796782454),
-                                    ("Mawlidyear (latent)", -6.505784060128229),
+                                     -6.095824562432225),
+                                    ("dayminute", -3.116899407194615),
+                                    ("Mawlidyear (latent)", -6.501289670540389),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.100318952020064),
+                                     -6.095824562432225),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.505784060128229),
-                                    ("Jumu'atul-Widayear (latent)", -5.589493328254074),
-                                    ("minuteday", -2.756279984197857),
+                                     -6.501289670540389),
+                                    ("Jumu'atul-Widayear (latent)", -5.584998938666234),
+                                    ("minuteday", -2.751785594610018),
                                     ("absorption of , after named dayintersect",
-                                     -5.8126368795682835),
-                                    ("intersectyear (latent)", -6.100318952020064),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.505784060128229),
+                                     -5.808142489980444),
+                                    ("intersectyear (latent)", -6.095824562432225),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.501289670540389),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.505784060128229),
+                                     -6.501289670540389),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.505784060128229),
-                                    ("intersecthhhmm", -6.100318952020064),
+                                     -6.501289670540389),
+                                    ("intersecthhhmm", -6.095824562432225),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.505784060128229),
-                                    ("Boss's Dayyear (latent)", -6.100318952020064),
+                                     -6.501289670540389),
+                                    ("Boss's Dayyear (latent)", -6.095824562432225),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.505784060128229),
-                                    ("Global Youth Service Dayyear (latent)", -6.505784060128229),
-                                    ("Dhanterasin|during <named-month>|year", -6.505784060128229),
-                                    ("tonight<time-of-day> o'clock", -6.505784060128229),
-                                    ("Tisha B'Avyear (latent)", -6.505784060128229),
-                                    ("Isra and Mi'rajyear (latent)", -5.589493328254074),
-                                    ("at <time-of-day>on <day>", -4.896346147694128),
+                                     -6.501289670540389),
+                                    ("Global Youth Service Dayyear (latent)", -6.501289670540389),
+                                    ("Dhanterasin|during <named-month>|year", -6.501289670540389),
+                                    ("tonight<time-of-day> o'clock", -6.501289670540389),
+                                    ("Tisha B'Avyear (latent)", -6.501289670540389),
+                                    ("Isra and Mi'rajyear (latent)", -5.584998938666234),
+                                    ("at <time-of-day>on <day>", -4.891851758106289),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.100318952020064),
+                                     -6.095824562432225),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.8126368795682835),
-                                    ("Christmasyear (latent)", -6.100318952020064),
-                                    ("Saturdayintersect", -6.505784060128229),
-                                    ("Naraka Chaturdashiyear (latent)", -6.100318952020064),
-                                    ("Thai Pongalin|during <named-month>|year", -6.505784060128229),
-                                    ("dayweek", -6.505784060128229),
-                                    ("Easter Sundayyear (latent)", -5.8126368795682835),
+                                     -5.808142489980444),
+                                    ("Christmasyear (latent)", -6.095824562432225),
+                                    ("Saturdayintersect", -6.501289670540389),
+                                    ("Naraka Chaturdashiyear (latent)", -6.095824562432225),
+                                    ("Thai Pongalin|during <named-month>|year", -6.501289670540389),
+                                    ("dayweek", -6.501289670540389),
+                                    ("Easter Sundayyear (latent)", -5.808142489980444),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.100318952020064),
-                                    ("weekyear", -5.407171771460119),
-                                    ("King's Dayyear (latent)", -5.001706663351954),
-                                    ("hh:mmin|during the <part-of-day>", -5.589493328254074),
+                                     -6.095824562432225),
+                                    ("weekyear", -5.402677381872279),
+                                    ("King's Dayyear (latent)", -4.997212273764115),
+                                    ("hh:mmin|during the <part-of-day>", -5.584998938666234),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.100318952020064),
+                                     -6.095824562432225),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.8126368795682835),
-                                    ("Hanukkahyear (latent)", -5.8126368795682835),
-                                    ("Rama Navamiyear (latent)", -6.505784060128229),
-                                    ("February<time> <part-of-day>", -6.505784060128229),
+                                     -5.808142489980444),
+                                    ("Hanukkahyear (latent)", -5.808142489980444),
+                                    ("Rama Navamiyear (latent)", -6.501289670540389),
+                                    ("February<time> <part-of-day>", -6.501289670540389),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.8126368795682835),
-                                    ("Great Lentyear (latent)", -6.505784060128229),
-                                    ("tomorrowat <time-of-day>", -5.8126368795682835),
+                                     -5.808142489980444),
+                                    ("Great Lentyear (latent)", -6.501289670540389),
+                                    ("tomorrowat <time-of-day>", -5.808142489980444),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.505784060128229),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.100318952020064),
-                                    ("Ugadiyear (latent)", -5.119489699008338),
-                                    ("Vaisakhiyear (latent)", -5.8126368795682835),
+                                     -6.501289670540389),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.095824562432225),
+                                    ("Ugadiyear (latent)", -5.1149953094204985),
+                                    ("Vaisakhiyear (latent)", -5.808142489980444),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.8126368795682835),
-                                    ("last <cycle> of <time>year (latent)", -5.8126368795682835),
-                                    ("at <time-of-day>tomorrow", -6.100318952020064),
-                                    ("tomorrow<time-of-day> am|pm", -6.505784060128229),
+                                     -5.808142489980444),
+                                    ("last <cycle> of <time>year (latent)", -5.808142489980444),
+                                    ("at <time-of-day>tomorrow", -6.095824562432225),
+                                    ("tomorrow<time-of-day> am|pm", -6.501289670540389),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.505784060128229),
-                                    ("Diwaliyear (latent)", -6.505784060128229),
-                                    ("between <time> and <time>on <day>", -6.100318952020064),
-                                    ("Black Fridayyear (latent)", -6.100318952020064),
+                                     -6.501289670540389),
+                                    ("Diwaliyear (latent)", -6.501289670540389),
+                                    ("between <time> and <time>on <day>", -6.095824562432225),
+                                    ("Black Fridayyear (latent)", -6.095824562432225),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.505784060128229),
+                                     -6.501289670540389),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.505784060128229),
-                                    ("Chhathyear (latent)", -6.100318952020064),
-                                    ("Vasant Panchamiyear (latent)", -6.505784060128229),
-                                    ("Rabindra Jayantiyear (latent)", -5.253021091632861),
-                                    ("this <part-of-day>at <time-of-day>", -5.253021091632861),
-                                    ("St Patrick's Dayyear (latent)", -6.505784060128229),
-                                    ("Thursday<time> (timezone)", -6.505784060128229),
+                                     -6.501289670540389),
+                                    ("Chhathyear (latent)", -6.095824562432225),
+                                    ("Vasant Panchamiyear (latent)", -6.501289670540389),
+                                    ("Rabindra Jayantiyear (latent)", -5.248526702045021),
+                                    ("this <part-of-day>at <time-of-day>", -5.248526702045021),
+                                    ("St Patrick's Dayyear (latent)", -6.501289670540389),
+                                    ("Thursday<time> (timezone)", -6.501289670540389),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.505784060128229),
-                                    ("Pargat Diwasyear (latent)", -5.253021091632861),
-                                    ("<datetime> - <datetime> (interval)July", -6.100318952020064),
+                                     -6.501289670540389),
+                                    ("Pargat Diwasyear (latent)", -5.248526702045021),
+                                    ("<datetime> - <datetime> (interval)July", -6.095824562432225),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.8126368795682835),
-                                    ("Februaryintersect", -6.505784060128229),
-                                    ("Simchat Torahyear (latent)", -6.505784060128229),
-                                    ("minuteyear", -6.505784060128229)],
+                                     -5.808142489980444),
+                                    ("Februaryintersect", -6.501289670540389),
+                                    ("Simchat Torahyear (latent)", -6.501289670540389),
+                                    ("minuteyear", -6.501289670540389)],
                                n = 516},
                    koData =
-                     ClassData{prior = -0.948882632875619, unseen = -6.8658910748834385,
+                     ClassData{prior = -1.0112926977755932, unseen = -6.792344427470809,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.667623200634641),
-                                    ("hourday", -3.5690109119665316),
+                                   [("Thursdayhhhmm", -4.593996885389966),
+                                    ("hourday", -3.4953845967218564),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.171700597410915),
-                                    ("<day-of-month> (ordinal)August", -6.171700597410915),
-                                    ("dayhour", -3.4308605734857145),
-                                    ("<time> timezoneyear (latent)", -5.47855341685097),
+                                     -6.09807428216624),
+                                    ("<day-of-month> (ordinal)August", -6.09807428216624),
+                                    ("dayhour", -3.3572342582410393),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.25540986553676),
-                                    ("Tuesdayfrom|since|after <time>", -5.47855341685097),
-                                    ("daymonth", -3.4636503963087053),
-                                    ("hourquarter", -5.25540986553676),
-                                    ("monthyear", -4.785406236291025),
-                                    ("<time-of-day> am|pmyear (latent)", -5.47855341685097),
-                                    ("Thai Pongalyear (latent)", -5.47855341685097),
-                                    ("intersecthh:mm", -6.171700597410915),
+                                     -5.181783550292085),
+                                    ("Tuesdayfrom|since|after <time>", -5.404927101606295),
+                                    ("daymonth", -3.39002408106403),
+                                    ("hourquarter", -5.181783550292085),
+                                    ("monthyear", -4.845311313670872),
+                                    ("Thai Pongalyear (latent)", -5.404927101606295),
+                                    ("intersecthh:mm", -6.09807428216624),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.766235489302751),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.171700597410915),
-                                    ("houryear", -4.37994112818286),
+                                     -5.6926091740580755),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.09807428216624),
+                                    ("houryear", -4.711779921046349),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.171700597410915),
-                                    ("<day-of-month> (ordinal)October", -6.171700597410915),
+                                     -6.09807428216624),
+                                    ("<day-of-month> (ordinal)October", -6.09807428216624),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.47855341685097),
-                                    ("hournograin", -4.918937628915547),
-                                    ("<time-of-day> am|pmintersect", -4.918937628915547),
-                                    ("Octoberyear (latent)", -5.766235489302751),
-                                    ("Good Fridayyear (latent)", -5.766235489302751),
+                                     -5.404927101606295),
+                                    ("hournograin", -4.845311313670872),
+                                    ("<time-of-day> am|pmintersect", -4.845311313670872),
+                                    ("Octoberyear (latent)", -6.09807428216624),
+                                    ("Good Fridayyear (latent)", -5.6926091740580755),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.766235489302751),
-                                    ("early morningat <time-of-day>", -6.171700597410915),
-                                    ("until <time>on <day>", -5.47855341685097),
+                                     -5.6926091740580755),
+                                    ("early morningat <time-of-day>", -6.09807428216624),
+                                    ("until <time>on <day>", -5.404927101606295),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.171700597410915),
-                                    ("time-of-day (latent)intersect", -5.47855341685097),
-                                    ("todayin <number> (implicit minutes)", -6.171700597410915),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.47855341685097),
+                                     -6.09807428216624),
+                                    ("time-of-day (latent)intersect", -5.404927101606295),
+                                    ("todayin <number> (implicit minutes)", -6.09807428216624),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.171700597410915),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.171700597410915),
-                                    ("hh:mmon <day>", -4.918937628915547),
-                                    ("hhhmmintersect", -5.766235489302751),
-                                    ("absorption of , after named dayJuly", -5.25540986553676),
-                                    ("from|since|after <time>July", -5.766235489302751),
+                                     -6.09807428216624),
+                                    ("hh:mmon <day>", -4.845311313670872),
+                                    ("hhhmmintersect", -5.6926091740580755),
+                                    ("absorption of , after named dayJuly", -5.181783550292085),
+                                    ("from|since|after <time>July", -5.6926091740580755),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.25540986553676),
-                                    ("Clean Mondayyear (latent)", -6.171700597410915),
-                                    ("monthhour", -6.171700597410915),
+                                     -5.181783550292085),
+                                    ("Clean Mondayyear (latent)", -6.09807428216624),
+                                    ("monthhour", -6.09807428216624),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.766235489302751),
-                                    ("hourmonth", -4.031634433914644),
-                                    ("todayat <time-of-day>", -6.171700597410915),
-                                    ("hhhmmyear (latent)", -4.918937628915547),
-                                    ("from|since|after <time>December", -6.171700597410915),
+                                     -5.6926091740580755),
+                                    ("hourmonth", -3.9580081186699694),
+                                    ("todayat <time-of-day>", -6.09807428216624),
+                                    ("from|since|after <time>December", -6.09807428216624),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.171700597410915),
-                                    ("<time-of-day> am|pmon <day>", -4.918937628915547),
-                                    ("Mondayyear (latent)", -5.47855341685097),
-                                    ("dayday", -4.031634433914644),
-                                    ("mm/ddat <time-of-day>", -5.25540986553676),
-                                    ("on <day>September", -5.47855341685097),
-                                    ("time-of-day (latent)September", -5.766235489302751),
-                                    ("hourhour", -4.09225905573108),
-                                    ("time-of-day (latent)on <day>", -4.667623200634641),
+                                     -6.09807428216624),
+                                    ("<time-of-day> am|pmon <day>", -4.845311313670872),
+                                    ("Mondayyear (latent)", -5.404927101606295),
+                                    ("dayday", -3.9580081186699694),
+                                    ("mm/ddat <time-of-day>", -5.181783550292085),
+                                    ("on <day>September", -5.404927101606295),
+                                    ("time-of-day (latent)September", -5.6926091740580755),
+                                    ("hourhour", -4.018632740486404),
+                                    ("time-of-day (latent)on <day>", -4.593996885389966),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.766235489302751),
-                                    ("dayyear", -3.1271781596874924),
-                                    ("Thursdaymm/dd", -6.171700597410915),
-                                    ("New Year's Dayyear (latent)", -5.25540986553676),
-                                    ("time-of-day (latent)Sunday", -5.766235489302751),
-                                    ("Thursdayfrom|since|after <time>", -4.46695250517249),
-                                    ("Thursdayat <time-of-day>", -4.562262684976815),
+                                     -5.6926091740580755),
+                                    ("dayyear", -3.2947139012597053),
+                                    ("Thursdaymm/dd", -6.09807428216624),
+                                    ("New Year's Dayyear (latent)", -5.181783550292085),
+                                    ("time-of-day (latent)Sunday", -5.6926091740580755),
+                                    ("Thursdayfrom|since|after <time>", -4.393326189927815),
+                                    ("Thursdayat <time-of-day>", -4.48863636973214),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.171700597410915),
-                                    ("Aprilyear (latent)", -6.171700597410915),
-                                    ("the <day-of-month> (ordinal)July", -6.171700597410915),
-                                    ("the <day-of-month> (number)July", -6.171700597410915),
-                                    ("monthminute", -6.171700597410915),
-                                    ("<time-of-day> am|pmtomorrow", -5.766235489302751),
-                                    ("Thursdayhh:mm", -5.25540986553676),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.766235489302751),
-                                    ("minutemonth", -4.031634433914644),
-                                    ("time-of-day (latent)Friday", -5.766235489302751),
-                                    ("minutehour", -6.171700597410915),
-                                    ("part of daysat <time-of-day>", -5.073088308742806),
+                                     -6.09807428216624),
+                                    ("Aprilyear (latent)", -6.09807428216624),
+                                    ("the <day-of-month> (ordinal)July", -6.09807428216624),
+                                    ("the <day-of-month> (number)July", -6.09807428216624),
+                                    ("monthminute", -6.09807428216624),
+                                    ("<time-of-day> am|pmtomorrow", -5.6926091740580755),
+                                    ("Thursdayhh:mm", -5.181783550292085),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.6926091740580755),
+                                    ("minutemonth", -3.9580081186699694),
+                                    ("time-of-day (latent)Friday", -5.6926091740580755),
+                                    ("minutehour", -6.09807428216624),
+                                    ("part of daysat <time-of-day>", -4.99946199349813),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.8203253402474373),
-                                    ("Augustyear (latent)", -5.766235489302751),
-                                    ("week-endin|during <named-month>|year", -6.171700597410915),
-                                    ("time-of-day (latent)Tuesday", -5.766235489302751),
+                                     -3.7466990250027625),
+                                    ("Augustyear (latent)", -5.6926091740580755),
+                                    ("week-endin|during <named-month>|year", -6.09807428216624),
+                                    ("time-of-day (latent)Tuesday", -5.6926091740580755),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.766235489302751),
+                                     -5.6926091740580755),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.171700597410915),
+                                     -6.09807428216624),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.171700597410915),
-                                    ("Sundayyear (latent)", -5.25540986553676),
-                                    ("hourweek", -5.25540986553676),
-                                    ("the <day-of-month> (ordinal)Monday", -5.47855341685097),
-                                    ("Christmasat <time-of-day>", -6.171700597410915),
-                                    ("from|since|after <time>year (latent)", -5.073088308742806),
-                                    ("hhhmmon <day>", -5.25540986553676),
-                                    ("yesterday<time-of-day> am|pm", -6.171700597410915),
-                                    ("<day-of-month> (ordinal)July", -5.47855341685097),
+                                     -6.09807428216624),
+                                    ("Sundayyear (latent)", -5.181783550292085),
+                                    ("hourweek", -5.181783550292085),
+                                    ("the <day-of-month> (ordinal)Monday", -5.404927101606295),
+                                    ("Christmasat <time-of-day>", -6.09807428216624),
+                                    ("from|since|after <time>year (latent)", -5.6926091740580755),
+                                    ("hhhmmon <day>", -5.181783550292085),
+                                    ("yesterday<time-of-day> am|pm", -6.09807428216624),
+                                    ("<day-of-month> (ordinal)July", -5.404927101606295),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.171700597410915),
-                                    ("mm/ddyear (latent)", -6.171700597410915),
+                                     -6.09807428216624),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.171700597410915),
+                                     -6.09807428216624),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.171700597410915),
-                                    ("at <time-of-day>intersect", -5.25540986553676),
-                                    ("hh:mmyear (latent)", -4.785406236291025),
-                                    ("Holiyear (latent)", -6.171700597410915),
-                                    ("until <time><time-of-day> am|pm", -6.171700597410915),
+                                     -6.09807428216624),
+                                    ("at <time-of-day>intersect", -5.181783550292085),
+                                    ("Holiyear (latent)", -6.09807428216624),
+                                    ("until <time><time-of-day> am|pm", -6.09807428216624),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.766235489302751),
-                                    ("dayminute", -3.309499716481447),
-                                    ("yyyy-mm-ddhh:mm", -5.766235489302751),
-                                    ("intersectfrom|since|after <time>", -5.766235489302751),
-                                    ("intersectSeptember", -4.299898420509324),
-                                    ("minuteday", -3.014700176260802),
-                                    ("absorption of , after named dayintersect",
-                                     -6.171700597410915),
-                                    ("intersectyear (latent)", -6.171700597410915),
-                                    ("Februaryin|during the <part-of-day>", -6.171700597410915),
+                                     -5.6926091740580755),
+                                    ("dayminute", -3.235873401236772),
+                                    ("yyyy-mm-ddhh:mm", -5.6926091740580755),
+                                    ("intersectfrom|since|after <time>", -5.6926091740580755),
+                                    ("intersectSeptember", -4.226272105264648),
+                                    ("minuteday", -2.9410738610161267),
+                                    ("absorption of , after named dayintersect", -6.09807428216624),
+                                    ("intersectyear (latent)", -6.09807428216624),
+                                    ("Februaryin|during the <part-of-day>", -6.09807428216624),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.171700597410915),
-                                    ("time-of-day (latent)July", -5.47855341685097),
-                                    ("Saturdayyear (latent)", -6.171700597410915),
+                                     -6.09807428216624),
+                                    ("time-of-day (latent)July", -5.404927101606295),
+                                    ("Saturdayyear (latent)", -6.09807428216624),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.171700597410915),
-                                    ("<day-of-month> (ordinal)Monday", -4.918937628915547),
-                                    ("at <time-of-day>on <day>", -5.25540986553676),
+                                     -6.09807428216624),
+                                    ("<day-of-month> (ordinal)Monday", -4.845311313670872),
+                                    ("at <time-of-day>on <day>", -5.181783550292085),
                                     ("absorption of , after named daySeptember",
-                                     -4.918937628915547),
-                                    ("Naraka Chaturdashiyear (latent)", -6.171700597410915),
-                                    ("from|since|after <time>on <day>", -5.25540986553676),
-                                    ("dayweek", -6.171700597410915),
-                                    ("Easter Sundayyear (latent)", -5.766235489302751),
-                                    ("Thursday<time-of-day> am|pm", -4.918937628915547),
-                                    ("weekyear", -5.766235489302751),
-                                    ("time-of-day (latent)Thursday", -5.766235489302751),
+                                     -4.845311313670872),
+                                    ("Naraka Chaturdashiyear (latent)", -6.09807428216624),
+                                    ("from|since|after <time>on <day>", -5.181783550292085),
+                                    ("dayweek", -6.09807428216624),
+                                    ("Easter Sundayyear (latent)", -5.6926091740580755),
+                                    ("Thursday<time-of-day> am|pm", -4.845311313670872),
+                                    ("weekyear", -5.6926091740580755),
+                                    ("time-of-day (latent)Thursday", -5.6926091740580755),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.171700597410915),
-                                    ("<day-of-month> (ordinal)April", -6.171700597410915),
+                                     -6.09807428216624),
+                                    ("<day-of-month> (ordinal)April", -6.09807428216624),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.766235489302751),
+                                     -5.6926091740580755),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.47855341685097),
-                                    ("Sundayfrom|since|after <time>", -6.171700597410915),
-                                    ("absorption of , after named dayFebruary", -5.25540986553676),
+                                     -5.404927101606295),
+                                    ("Sundayfrom|since|after <time>", -6.09807428216624),
+                                    ("absorption of , after named dayFebruary", -5.181783550292085),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.766235489302751),
+                                     -5.6926091740580755),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.171700597410915),
-                                    ("tomorrowat <time-of-day>", -6.171700597410915),
-                                    ("daynograin", -5.766235489302751),
-                                    ("Fridayin|during <named-month>|year", -6.171700597410915),
+                                     -6.09807428216624),
+                                    ("tomorrowat <time-of-day>", -6.09807428216624),
+                                    ("daynograin", -5.6926091740580755),
+                                    ("Fridayin|during <named-month>|year", -6.09807428216624),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.766235489302751),
-                                    ("last <cycle> of <time>year (latent)", -5.766235489302751),
-                                    ("tomorrow<time-of-day> am|pm", -6.171700597410915),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.47855341685097),
-                                    ("Diwaliyear (latent)", -5.766235489302751),
+                                     -5.6926091740580755),
+                                    ("last <cycle> of <time>year (latent)", -5.6926091740580755),
+                                    ("tomorrow<time-of-day> am|pm", -6.09807428216624),
+                                    ("Diwaliyear (latent)", -5.6926091740580755),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.171700597410915),
-                                    ("this <part-of-day>at <time-of-day>", -5.25540986553676),
-                                    ("Fridayyear (latent)", -5.25540986553676),
-                                    ("time-of-day (latent)April", -6.171700597410915),
-                                    ("minuteyear", -3.974476020074696)],
-                               n = 326}}),
+                                     -6.09807428216624),
+                                    ("this <part-of-day>at <time-of-day>", -5.181783550292085),
+                                    ("Fridayyear (latent)", -5.181783550292085),
+                                    ("time-of-day (latent)April", -6.09807428216624)],
+                               n = 295}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1750,21 +1736,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15091338337746693,
-                               unseen = -5.420534999272286,
+                     ClassData{prior = -4.42550090040407e-2, unseen = -5.41610040220442,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.702867238791926e-2),
-                                    ("intersect 2 numbers", -4.029806041084529)],
+                                   [("integer (numeric)", -2.2574322038539065e-2),
+                                    ("intersect 2 numbers", -4.02535169073515)],
                                n = 221},
                    koData =
-                     ClassData{prior = -1.9655571464391097, unseen = -3.713572066704308,
+                     ClassData{prior = -3.139832617527748, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.6094379124341003),
-                                    ("negative numbers", -0.3930425881096072),
-                                    ("compose by multiplication", -2.3025850929940455)],
-                               n = 36}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
diff --git a/Duckling/Ranking/Classifiers/EN_ZA.hs b/Duckling/Ranking/Classifiers/EN_ZA.hs
index cafcbadcc..44da4c005 100644
--- a/Duckling/Ranking/Classifiers/EN_ZA.hs
+++ b/Duckling/Ranking/Classifiers/EN_ZA.hs
@@ -276,7 +276,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.701375407759786, unseen = -4.51085950651685,
+                     ClassData{prior = -1.6808968764162453, unseen = -4.51085950651685,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -297,44 +297,44 @@ classifiers
                                     ("August", -3.8066624897703196)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.201421728167374, unseen = -5.631211781821365,
+                     ClassData{prior = -0.20604911795490968, unseen = -5.60947179518496,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.018183201256536),
-                                    ("week", -4.9344739331306915),
+                                   [("<integer> to|till|before <hour-of-day>", -3.996364153861897),
+                                    ("week", -4.912654885736052),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.9344739331306915),
-                                    ("today", -4.9344739331306915),
-                                    ("intersect", -2.9885637840753785),
-                                    ("<time> for <duration>", -4.241326752570746),
-                                    ("second", -4.9344739331306915), ("now", -3.3250360206965914),
-                                    ("tomorrow", -4.529008825022527),
-                                    ("this|last|next <cycle>", -4.9344739331306915),
-                                    ("day", -1.7774735119805785),
-                                    ("the <day-of-month> (ordinal)", -4.529008825022527),
-                                    ("the <day-of-month> (number)", -3.548179572010801),
-                                    ("time-of-day (latent)", -2.492126897761487),
-                                    ("<time-of-day> am|pm", -4.241326752570746),
-                                    ("hh:mm", -4.529008825022527), ("nograin", -3.3250360206965914),
+                                     -4.912654885736052),
+                                    ("today", -4.912654885736052),
+                                    ("intersect", -3.2079067934976266),
+                                    ("<time> for <duration>", -4.219507705176107),
+                                    ("second", -4.912654885736052), ("now", -3.3032169733019514),
+                                    ("tomorrow", -4.507189777627888),
+                                    ("this|last|next <cycle>", -4.912654885736052),
+                                    ("day", -1.7991395765256777),
+                                    ("the <day-of-month> (ordinal)", -4.507189777627888),
+                                    ("the <day-of-month> (number)", -3.5263605246161616),
+                                    ("time-of-day (latent)", -2.4703078503668476),
+                                    ("<time-of-day> am|pm", -4.219507705176107),
+                                    ("hh:mm", -4.507189777627888), ("nograin", -3.3032169733019514),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.529008825022527),
+                                     -4.507189777627888),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)", -3.835861644462582),
-                                    ("Easter Sunday", -4.9344739331306915),
-                                    ("Christmas", -4.241326752570746),
-                                    ("hour", -2.3317842476863078), ("month", -4.9344739331306915),
-                                    ("<datetime> - <datetime> (interval)", -2.7372493557944724),
+                                     -4.912654885736052),
+                                    ("<day-of-month> (ordinal)", -3.8140425970679424),
+                                    ("Easter Sunday", -4.912654885736052),
+                                    ("Christmas", -4.219507705176107), ("hour", -2.309965200291668),
+                                    ("month", -4.912654885736052),
+                                    ("<datetime> - <datetime> (interval)", -2.715430308399833),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.9885637840753785),
+                                     -2.966744736680739),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("minute", -1.9900349539642512),
-                                    ("right now", -4.9344739331306915),
-                                    ("<month> dd-dd (interval)", -4.241326752570746),
-                                    ("part of days", -4.9344739331306915),
-                                    ("dd-dd <month> (interval)", -4.529008825022527)],
-                               n = 121}}),
+                                     -4.507189777627888),
+                                    ("minute", -1.994884153651773),
+                                    ("right now", -4.912654885736052),
+                                    ("<month> dd-dd (interval)", -4.219507705176107),
+                                    ("part of days", -4.912654885736052),
+                                    ("dd-dd <month> (interval)", -4.507189777627888)],
+                               n = 118}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
@@ -992,462 +992,450 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4907042205665696, unseen = -7.174724309836376,
+                     ClassData{prior = -0.45469784807592467,
+                               unseen = -7.170888478512505,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.480811139196849),
-                                    ("Karva Chauthyear (latent)", -6.480811139196849),
+                                   [("Navaratriyear (latent)", -6.476972362889683),
+                                    ("Karva Chauthyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Maha Shivaratriyear (latent)", -6.480811139196849),
-                                    ("Ramadanyear (latent)", -5.228048170701481),
+                                     -6.476972362889683),
+                                    ("Maha Shivaratriyear (latent)", -6.476972362889683),
+                                    ("Ramadanyear (latent)", -5.224209394394315),
                                     ("<datetime> - <datetime> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Bhai Doojyear (latent)", -6.480811139196849),
-                                    ("hourday", -4.465908118654584),
-                                    ("dayhour", -3.4362887014734254),
+                                     -5.090678001769792),
+                                    ("Bhai Doojyear (latent)", -6.476972362889683),
+                                    ("hourday", -4.462069342347418),
+                                    ("dayhour", -3.4324499251662597),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.094516778076958),
-                                    ("Martin Luther King's Dayyear (latent)", -6.075346031088684),
-                                    ("Shemini Atzeretyear (latent)", -6.480811139196849),
-                                    ("daymonth", -4.465908118654584),
-                                    ("monthday", -6.075346031088684),
-                                    ("monthyear", -4.689051669968793),
-                                    ("Yom Ha'atzmautyear (latent)", -6.480811139196849),
-                                    ("Orthodox Good Fridayyear (latent)", -6.075346031088684),
-                                    ("Vijayadashamiyear (latent)", -6.480811139196849),
-                                    ("Thai Pongalyear (latent)", -5.787663958636903),
-                                    ("Thiru Onamyear (latent)", -5.787663958636903),
-                                    ("hhhmmabsorption of , after named day", -6.480811139196849),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.480811139196849),
+                                     -5.090678001769792),
+                                    ("Martin Luther King's Dayyear (latent)", -6.071507254781518),
+                                    ("Shemini Atzeretyear (latent)", -6.476972362889683),
+                                    ("daymonth", -4.462069342347418),
+                                    ("monthday", -6.071507254781518),
+                                    ("monthyear", -4.685212893661627),
+                                    ("Yom Ha'atzmautyear (latent)", -6.476972362889683),
+                                    ("Orthodox Good Fridayyear (latent)", -6.071507254781518),
+                                    ("Vijayadashamiyear (latent)", -6.476972362889683),
+                                    ("Thai Pongalyear (latent)", -5.783825182329737),
+                                    ("Thiru Onamyear (latent)", -5.783825182329737),
+                                    ("hhhmmabsorption of , after named day", -6.476972362889683),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.564520407322694),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.480811139196849),
-                                    ("Krishna Janmashtamiyear (latent)", -6.075346031088684),
-                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.480811139196849),
-                                    ("houryear", -5.564520407322694),
+                                     -5.560681631015528),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.476972362889683),
+                                    ("Krishna Janmashtamiyear (latent)", -6.071507254781518),
+                                    ("Guru Gobind Singh Jayantiyear (latent)", -6.476972362889683),
+                                    ("houryear", -5.560681631015528),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("Christmas<time-of-day> am|pm", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Christmas<time-of-day> am|pm", -6.476972362889683),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.787663958636903),
-                                    ("intersectin|during <named-month>|year", -6.480811139196849),
-                                    ("<time-of-day> am|pmintersect", -5.228048170701481),
-                                    ("Earth Houryear (latent)", -6.480811139196849),
-                                    ("Ganesh Chaturthiyear (latent)", -6.480811139196849),
-                                    ("Octoberyear (latent)", -4.976733742420574),
-                                    ("intersect<time-of-day> am|pm", -6.480811139196849),
-                                    ("Mattu Pongalyear (latent)", -6.480811139196849),
-                                    ("Saturday<part-of-day> at <time-of-day>", -6.480811139196849),
-                                    ("Shavuotyear (latent)", -6.480811139196849),
-                                    ("Parsi New Yearyear (latent)", -5.564520407322694),
+                                     -5.783825182329737),
+                                    ("intersectin|during <named-month>|year", -6.476972362889683),
+                                    ("<time-of-day> am|pmintersect", -5.224209394394315),
+                                    ("Earth Houryear (latent)", -6.476972362889683),
+                                    ("Ganesh Chaturthiyear (latent)", -6.476972362889683),
+                                    ("Octoberyear (latent)", -4.972894966113409),
+                                    ("intersect<time-of-day> am|pm", -6.476972362889683),
+                                    ("Mattu Pongalyear (latent)", -6.476972362889683),
+                                    ("Saturday<part-of-day> at <time-of-day>", -6.476972362889683),
+                                    ("Shavuotyear (latent)", -6.476972362889683),
+                                    ("Parsi New Yearyear (latent)", -5.560681631015528),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.480811139196849),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.480811139196849),
-                                    ("todayin|within|after <duration>", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.476972362889683),
+                                    ("todayin|within|after <duration>", -6.476972362889683),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -6.075346031088684),
-                                    ("Marchyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Marchyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hhhmm",
-                                     -6.075346031088684),
-                                    ("Sukkotyear (latent)", -6.075346031088684),
-                                    ("hhhmmintersect", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Sukkotyear (latent)", -6.071507254781518),
+                                    ("hhhmmintersect", -6.071507254781518),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.075346031088684),
-                                    ("Clean Mondayyear (latent)", -6.075346031088684),
-                                    ("monthhour", -6.075346031088684),
+                                     -6.071507254781518),
+                                    ("Clean Mondayyear (latent)", -6.071507254781518),
+                                    ("monthhour", -6.071507254781518),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.564520407322694),
-                                    ("todayat <time-of-day>", -6.480811139196849),
-                                    ("Thursday<time> timezone", -4.082915866398478),
-                                    ("tonight<time-of-day> am|pm", -6.480811139196849),
-                                    ("time-of-day (latent)tonight", -6.075346031088684),
-                                    ("from|since|after <time>December", -6.480811139196849),
-                                    ("<time-of-day> am|pmon <day>", -4.465908118654584),
+                                     -5.560681631015528),
+                                    ("todayat <time-of-day>", -6.476972362889683),
+                                    ("Thursday<time> timezone", -4.079077090091312),
+                                    ("tonight<time-of-day> am|pm", -6.476972362889683),
+                                    ("time-of-day (latent)tonight", -6.071507254781518),
+                                    ("from|since|after <time>December", -6.476972362889683),
+                                    ("<time-of-day> am|pmon <day>", -4.462069342347418),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("yyyy-mm-ddhh:mm:ss", -6.075346031088684),
-                                    ("dayday", -3.7082224169570672),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.075346031088684),
-                                    ("tonightat <time-of-day>", -5.382198850528739),
+                                     -6.476972362889683),
+                                    ("yyyy-mm-ddhh:mm:ss", -6.071507254781518),
+                                    ("dayday", -3.7043836406499016),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.071507254781518),
+                                    ("tonightat <time-of-day>", -5.378360074221573),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("Dayananda Saraswati Jayantiyear (latent)",
-                                     -6.480811139196849),
-                                    ("today<time-of-day> am|pm", -6.480811139196849),
-                                    ("Februarythe <day-of-month> (ordinal)", -6.075346031088684),
-                                    ("at <time-of-day><time> <part-of-day>", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)intersect", -6.075346031088684),
-                                    ("hourhour", -3.5103966736271475),
-                                    ("Mahavir Jayantiyear (latent)", -6.075346031088684),
-                                    ("Navaratriin|during <named-month>|year", -6.480811139196849),
-                                    ("Wednesdaythis|last|next <cycle>", -6.480811139196849),
-                                    ("Lentyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("today<time-of-day> am|pm", -6.476972362889683),
+                                    ("Februarythe <day-of-month> (ordinal)", -6.071507254781518),
+                                    ("at <time-of-day><time> <part-of-day>", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)intersect", -6.071507254781518),
+                                    ("hourhour", -3.506557897319982),
+                                    ("Mahavir Jayantiyear (latent)", -6.071507254781518),
+                                    ("Navaratriin|during <named-month>|year", -6.476972362889683),
+                                    ("Wednesdaythis|last|next <cycle>", -6.476972362889683),
+                                    ("Lentyear (latent)", -6.476972362889683),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.609008962295257),
-                                    ("Boghiyear (latent)", -6.480811139196849),
-                                    ("dayyear", -1.9216848917101639),
+                                     -4.605170185988091),
+                                    ("Boghiyear (latent)", -6.476972362889683),
+                                    ("dayyear", -1.9178461154029982),
                                     ("Karva Chauthin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Thursdayfrom|since|after <time>", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Thursdayfrom|since|after <time>", -6.071507254781518),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Thursdayat <time-of-day>", -5.787663958636903),
-                                    ("Islamic New Yearyear (latent)", -6.075346031088684),
-                                    ("Laylat al-Qadryear (latent)", -5.564520407322694),
-                                    ("part of days<time-of-day> am|pm", -6.480811139196849),
-                                    ("Shrove Tuesdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Thursdayat <time-of-day>", -5.783825182329737),
+                                    ("Islamic New Yearyear (latent)", -6.071507254781518),
+                                    ("Laylat al-Qadryear (latent)", -5.560681631015528),
+                                    ("part of days<time-of-day> am|pm", -6.476972362889683),
+                                    ("Shrove Tuesdayyear (latent)", -6.476972362889683),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.787663958636903),
-                                    ("hourminute", -6.075346031088684),
-                                    ("<time-of-day> am|pmtomorrow", -5.564520407322694),
-                                    ("Yom Kippuryear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.787663958636903),
-                                    ("<part-of-day> of <time>year (latent)", -6.480811139196849),
-                                    ("minutehour", -5.228048170701481),
-                                    ("Kaanum Pongalyear (latent)", -6.075346031088684),
-                                    ("Maha Saptamiyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("hourminute", -6.071507254781518),
+                                    ("<time-of-day> am|pmtomorrow", -5.560681631015528),
+                                    ("Yom Kippuryear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.783825182329737),
+                                    ("<part-of-day> of <time>year (latent)", -6.476972362889683),
+                                    ("minutehour", -5.224209394394315),
+                                    ("Kaanum Pongalyear (latent)", -6.071507254781518),
+                                    ("Maha Saptamiyear (latent)", -6.476972362889683),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("time-of-day (latent)tomorrow", -5.564520407322694),
-                                    ("part of daysat <time-of-day>", -4.871373226762748),
+                                     -5.783825182329737),
+                                    ("time-of-day (latent)tomorrow", -5.560681631015528),
+                                    ("part of daysat <time-of-day>", -4.867534450455582),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.465908118654584),
-                                    ("for <duration> from <time>December", -6.480811139196849),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.480811139196849),
+                                     -4.462069342347418),
+                                    ("for <duration> from <time>December", -6.476972362889683),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.476972362889683),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.228048170701481),
+                                     -5.224209394394315),
                                     ("intersect by \",\", \"of\", \"from\" for yearhhhmm",
-                                     -5.228048170701481),
-                                    ("time-of-day (latent)this <part-of-day>", -6.480811139196849),
-                                    ("Pentecostyear (latent)", -6.480811139196849),
+                                     -5.224209394394315),
+                                    ("time-of-day (latent)this <part-of-day>", -6.476972362889683),
+                                    ("Pentecostyear (latent)", -6.476972362889683),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.228048170701481),
-                                    ("<day-of-month> (ordinal)February", -6.480811139196849),
-                                    ("Eid al-Fitryear (latent)", -5.094516778076958),
+                                     -5.224209394394315),
+                                    ("<day-of-month> (ordinal)February", -6.476972362889683),
+                                    ("Eid al-Fitryear (latent)", -5.090678001769792),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.480811139196849),
-                                    ("Mondayin|during the <part-of-day>", -6.480811139196849),
-                                    ("Chhathin|during <named-month>|year", -6.480811139196849),
-                                    ("Diwaliin|during <named-month>|year", -6.480811139196849),
-                                    ("this <part-of-day><time-of-day> am|pm", -6.480811139196849),
-                                    ("Vaisakhiin|during <named-month>|year", -6.480811139196849),
-                                    ("Guru Ravidass Jayantiyear (latent)", -5.228048170701481),
-                                    ("Raksha Bandhanyear (latent)", -6.480811139196849),
-                                    ("daysecond", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Mondayin|during the <part-of-day>", -6.476972362889683),
+                                    ("Chhathin|during <named-month>|year", -6.476972362889683),
+                                    ("Diwaliin|during <named-month>|year", -6.476972362889683),
+                                    ("this <part-of-day><time-of-day> am|pm", -6.476972362889683),
+                                    ("Vaisakhiin|during <named-month>|year", -6.476972362889683),
+                                    ("Guru Ravidass Jayantiyear (latent)", -5.224209394394315),
+                                    ("Raksha Bandhanyear (latent)", -6.476972362889683),
+                                    ("daysecond", -6.071507254781518),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.075346031088684),
-                                    ("Ratha-Yatrayear (latent)", -6.480811139196849),
-                                    ("Ashurayear (latent)", -6.480811139196849),
-                                    ("Tuesdayin|during <named-month>|year", -6.480811139196849),
-                                    ("Chinese New Yearyear (latent)", -6.480811139196849),
-                                    ("tomorrowintersect", -6.480811139196849),
-                                    ("Lag BaOmeryear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("Ratha-Yatrayear (latent)", -6.476972362889683),
+                                    ("Ashurayear (latent)", -6.476972362889683),
+                                    ("Tuesdayin|during <named-month>|year", -6.476972362889683),
+                                    ("Chinese New Yearyear (latent)", -6.476972362889683),
+                                    ("tomorrowintersect", -6.476972362889683),
+                                    ("Lag BaOmeryear (latent)", -6.476972362889683),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("Eid al-Adhayear (latent)", -4.340744975700578),
-                                    ("intersectin|during the <part-of-day>", -6.480811139196849),
-                                    ("Palm Sundayyear (latent)", -6.480811139196849),
-                                    ("Christmasat <time-of-day>", -6.480811139196849),
-                                    ("Passoveryear (latent)", -6.480811139196849),
-                                    ("Lazarus Saturdayyear (latent)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Eid al-Adhayear (latent)", -4.336906199393412),
+                                    ("intersectin|during the <part-of-day>", -6.476972362889683),
+                                    ("Palm Sundayyear (latent)", -6.476972362889683),
+                                    ("Christmasat <time-of-day>", -6.476972362889683),
+                                    ("Passoveryear (latent)", -6.476972362889683),
+                                    ("Lazarus Saturdayyear (latent)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.480811139196849),
-                                    ("hhhmmon <day>", -5.564520407322694),
-                                    ("Yom HaShoahyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("hhhmmon <day>", -5.560681631015528),
+                                    ("Yom HaShoahyear (latent)", -6.071507254781518),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Septemberyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Septemberyear (latent)", -6.071507254781518),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.976733742420574),
-                                    ("Halloweenyear (latent)", -6.480811139196849),
+                                     -4.972894966113409),
+                                    ("Halloweenyear (latent)", -6.476972362889683),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("from <time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.787663958636903),
+                                     -5.783825182329737),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.480811139196849),
-                                    ("at <time-of-day>intersect", -5.564520407322694),
-                                    ("Rosh Hashanahyear (latent)", -5.787663958636903),
-                                    ("Dhanterasyear (latent)", -6.480811139196849),
-                                    ("Tu BiShvatyear (latent)", -6.480811139196849),
-                                    ("<day-of-month> (ordinal)December", -5.787663958636903),
-                                    ("Holiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("at <time-of-day>intersect", -5.560681631015528),
+                                    ("Rosh Hashanahyear (latent)", -5.783825182329737),
+                                    ("Dhanterasyear (latent)", -6.476972362889683),
+                                    ("Tu BiShvatyear (latent)", -6.476972362889683),
+                                    ("<day-of-month> (ordinal)December", -5.783825182329737),
+                                    ("Holiyear (latent)", -5.783825182329737),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Holika Dahanyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("Holika Dahanyear (latent)", -5.783825182329737),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.075346031088684),
-                                    ("dayminute", -3.166625134524323),
-                                    ("Mawlidyear (latent)", -6.480811139196849),
+                                     -6.071507254781518),
+                                    ("dayminute", -3.162786358217157),
+                                    ("Mawlidyear (latent)", -6.476972362889683),
                                     ("from <datetime> - <datetime> (interval)on <day>",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.480811139196849),
-                                    ("Jumu'atul-Widayear (latent)", -5.564520407322694),
-                                    ("minuteday", -2.7313070632664775),
+                                     -6.476972362889683),
+                                    ("Jumu'atul-Widayear (latent)", -5.560681631015528),
+                                    ("minuteday", -2.7274682869593114),
                                     ("absorption of , after named dayintersect",
-                                     -5.787663958636903),
-                                    ("intersectyear (latent)", -6.480811139196849),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("intersectyear (latent)", -6.476972362889683),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.476972362889683),
                                     ("time-of-day (latent)in|within|after <duration>",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
-                                    ("intersecthhhmm", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("intersecthhhmm", -6.071507254781518),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Boss's Dayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Boss's Dayyear (latent)", -6.071507254781518),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.480811139196849),
-                                    ("Global Youth Service Dayyear (latent)", -6.480811139196849),
-                                    ("Dhanterasin|during <named-month>|year", -6.480811139196849),
-                                    ("tonight<time-of-day> o'clock", -6.480811139196849),
-                                    ("Tisha B'Avyear (latent)", -6.480811139196849),
-                                    ("Isra and Mi'rajyear (latent)", -5.564520407322694),
-                                    ("at <time-of-day>on <day>", -4.871373226762748),
+                                     -6.476972362889683),
+                                    ("Global Youth Service Dayyear (latent)", -6.476972362889683),
+                                    ("Dhanterasin|during <named-month>|year", -6.476972362889683),
+                                    ("tonight<time-of-day> o'clock", -6.476972362889683),
+                                    ("Tisha B'Avyear (latent)", -6.476972362889683),
+                                    ("Isra and Mi'rajyear (latent)", -5.560681631015528),
+                                    ("at <time-of-day>on <day>", -4.867534450455582),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("time-of-day (latent)<time> <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Christmasyear (latent)", -6.075346031088684),
-                                    ("Saturdayintersect", -6.480811139196849),
-                                    ("Naraka Chaturdashiyear (latent)", -6.075346031088684),
-                                    ("Thai Pongalin|during <named-month>|year", -6.480811139196849),
-                                    ("dayweek", -6.480811139196849),
-                                    ("Easter Sundayyear (latent)", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Christmasyear (latent)", -6.071507254781518),
+                                    ("Saturdayintersect", -6.476972362889683),
+                                    ("Naraka Chaturdashiyear (latent)", -6.071507254781518),
+                                    ("Thai Pongalin|during <named-month>|year", -6.476972362889683),
+                                    ("dayweek", -6.476972362889683),
+                                    ("Easter Sundayyear (latent)", -5.783825182329737),
                                     ("between <time-of-day> and <time-of-day> (interval)on <day>",
-                                     -6.075346031088684),
-                                    ("weekyear", -5.382198850528739),
-                                    ("King's Dayyear (latent)", -4.976733742420574),
-                                    ("hh:mmin|during the <part-of-day>", -5.564520407322694),
+                                     -6.071507254781518),
+                                    ("weekyear", -5.378360074221573),
+                                    ("King's Dayyear (latent)", -4.972894966113409),
+                                    ("hh:mmin|during the <part-of-day>", -5.560681631015528),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -6.075346031088684),
+                                     -6.071507254781518),
                                     ("first|second|third|fourth|fifth <day-of-week> of <time>year (latent)",
-                                     -5.787663958636903),
-                                    ("Hanukkahyear (latent)", -5.787663958636903),
-                                    ("Rama Navamiyear (latent)", -6.480811139196849),
-                                    ("February<time> <part-of-day>", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("Hanukkahyear (latent)", -5.783825182329737),
+                                    ("Rama Navamiyear (latent)", -6.476972362889683),
+                                    ("February<time> <part-of-day>", -6.476972362889683),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.787663958636903),
-                                    ("Great Lentyear (latent)", -6.480811139196849),
-                                    ("tomorrowat <time-of-day>", -5.787663958636903),
+                                     -5.783825182329737),
+                                    ("Great Lentyear (latent)", -6.476972362889683),
+                                    ("tomorrowat <time-of-day>", -5.783825182329737),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("tomorrow<part-of-day> at <time-of-day>", -6.075346031088684),
-                                    ("Ugadiyear (latent)", -5.094516778076958),
-                                    ("Vaisakhiyear (latent)", -5.787663958636903),
+                                     -6.476972362889683),
+                                    ("tomorrow<part-of-day> at <time-of-day>", -6.071507254781518),
+                                    ("Ugadiyear (latent)", -5.090678001769792),
+                                    ("Vaisakhiyear (latent)", -5.783825182329737),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -5.787663958636903),
-                                    ("last <cycle> of <time>year (latent)", -5.787663958636903),
-                                    ("at <time-of-day>tomorrow", -6.075346031088684),
-                                    ("tomorrow<time-of-day> am|pm", -6.480811139196849),
+                                     -5.783825182329737),
+                                    ("last <cycle> of <time>year (latent)", -5.783825182329737),
+                                    ("at <time-of-day>tomorrow", -6.071507254781518),
+                                    ("tomorrow<time-of-day> am|pm", -6.476972362889683),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.480811139196849),
-                                    ("Diwaliyear (latent)", -6.480811139196849),
-                                    ("between <time> and <time>on <day>", -6.075346031088684),
-                                    ("Black Fridayyear (latent)", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Diwaliyear (latent)", -6.476972362889683),
+                                    ("between <time> and <time>on <day>", -6.071507254781518),
+                                    ("Black Fridayyear (latent)", -6.071507254781518),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.480811139196849),
+                                     -6.476972362889683),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.480811139196849),
-                                    ("Chhathyear (latent)", -6.075346031088684),
-                                    ("Vasant Panchamiyear (latent)", -6.480811139196849),
-                                    ("Rabindra Jayantiyear (latent)", -5.228048170701481),
-                                    ("this <part-of-day>at <time-of-day>", -5.228048170701481),
-                                    ("St Patrick's Dayyear (latent)", -6.480811139196849),
-                                    ("Thursday<time> (timezone)", -6.480811139196849),
+                                     -6.476972362889683),
+                                    ("Chhathyear (latent)", -6.071507254781518),
+                                    ("Vasant Panchamiyear (latent)", -6.476972362889683),
+                                    ("Rabindra Jayantiyear (latent)", -5.224209394394315),
+                                    ("this <part-of-day>at <time-of-day>", -5.224209394394315),
+                                    ("St Patrick's Dayyear (latent)", -6.476972362889683),
+                                    ("Thursday<time> (timezone)", -6.476972362889683),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.480811139196849),
-                                    ("Pargat Diwasyear (latent)", -5.228048170701481),
-                                    ("<datetime> - <datetime> (interval)July", -6.075346031088684),
+                                     -6.476972362889683),
+                                    ("Pargat Diwasyear (latent)", -5.224209394394315),
+                                    ("<datetime> - <datetime> (interval)July", -6.071507254781518),
                                     ("on <day><named-month> <day-of-month> (non ordinal)",
-                                     -5.787663958636903),
-                                    ("Februaryintersect", -6.480811139196849),
-                                    ("Simchat Torahyear (latent)", -6.480811139196849),
-                                    ("minuteyear", -6.480811139196849)],
+                                     -5.783825182329737),
+                                    ("Februaryintersect", -6.476972362889683),
+                                    ("Simchat Torahyear (latent)", -6.476972362889683),
+                                    ("minuteyear", -6.476972362889683)],
                                n = 502},
                    koData =
-                     ClassData{prior = -0.9472529574781219, unseen = -6.843749949006225,
+                     ClassData{prior = -1.0068712796552217, unseen = -6.774223886357614,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Thursdayhhhmm", -4.645458704902203),
-                                    ("hourday", -3.546846416234093),
+                                   [("Thursdayhhhmm", -4.575855798319316),
+                                    ("hourday", -3.477243509651206),
                                     ("<hour-of-day> <integer><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)August", -6.149536101678477),
-                                    ("dayhour", -3.5845867442169403),
-                                    ("<time> timezoneyear (latent)", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)August", -6.07993319509559),
+                                    ("dayhour", -3.514983837634053),
                                     ("<time-of-day> - <time-of-day> (interval)on <day>",
-                                     -5.2332453698043215),
-                                    ("Tuesdayfrom|since|after <time>", -5.456388921118531),
-                                    ("daymonth", -3.441485900576267),
-                                    ("hourquarter", -5.2332453698043215),
-                                    ("monthyear", -4.896773133183109),
-                                    ("<time-of-day> am|pmyear (latent)", -5.456388921118531),
-                                    ("Thai Pongalyear (latent)", -5.456388921118531),
-                                    ("intersecthh:mm", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Tuesdayfrom|since|after <time>", -5.3867860145356445),
+                                    ("daymonth", -3.37188299399338),
+                                    ("hourquarter", -5.163642463221435),
+                                    ("monthyear", -4.827170226600222),
+                                    ("Thai Pongalyear (latent)", -5.3867860145356445),
+                                    ("intersecthh:mm", -6.07993319509559),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.744070993570313),
-                                    ("<day-of-month> (ordinal)Wednesday", -6.149536101678477),
-                                    ("houryear", -4.357776632450422),
+                                     -5.674468086987426),
+                                    ("<day-of-month> (ordinal)Wednesday", -6.07993319509559),
+                                    ("houryear", -4.693638833975699),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)October", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)October", -6.07993319509559),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.456388921118531),
-                                    ("hournograin", -4.896773133183109),
-                                    ("<time-of-day> am|pmintersect", -4.896773133183109),
-                                    ("Octoberyear (latent)", -6.149536101678477),
-                                    ("Good Fridayyear (latent)", -5.744070993570313),
+                                     -5.3867860145356445),
+                                    ("hournograin", -4.827170226600222),
+                                    ("<time-of-day> am|pmintersect", -4.827170226600222),
+                                    ("Octoberyear (latent)", -6.07993319509559),
+                                    ("Good Fridayyear (latent)", -5.674468086987426),
                                     ("time-of-day (latent)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("early morningat <time-of-day>", -6.149536101678477),
-                                    ("until <time>on <day>", -5.456388921118531),
+                                     -5.674468086987426),
+                                    ("early morningat <time-of-day>", -6.07993319509559),
+                                    ("until <time>on <day>", -5.3867860145356445),
                                     ("part of days<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)intersect", -5.456388921118531),
-                                    ("todayin <number> (implicit minutes)", -6.149536101678477),
-                                    ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)intersect", -5.3867860145356445),
+                                    ("todayin <number> (implicit minutes)", -6.07993319509559),
                                     ("this <part-of-day><time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -6.149536101678477),
-                                    ("hh:mmon <day>", -4.896773133183109),
-                                    ("hhhmmintersect", -5.744070993570313),
-                                    ("absorption of , after named dayJuly", -5.2332453698043215),
-                                    ("from|since|after <time>July", -5.744070993570313),
+                                     -6.07993319509559),
+                                    ("hh:mmon <day>", -4.827170226600222),
+                                    ("hhhmmintersect", -5.674468086987426),
+                                    ("absorption of , after named dayJuly", -5.163642463221435),
+                                    ("from|since|after <time>July", -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -5.2332453698043215),
-                                    ("Clean Mondayyear (latent)", -6.149536101678477),
-                                    ("monthhour", -6.149536101678477),
+                                     -5.163642463221435),
+                                    ("Clean Mondayyear (latent)", -6.07993319509559),
+                                    ("monthhour", -6.07993319509559),
                                     ("<day-of-month> (ordinal)intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("hourmonth", -4.009469938182206),
-                                    ("todayat <time-of-day>", -6.149536101678477),
-                                    ("hhhmmyear (latent)", -4.896773133183109),
-                                    ("from|since|after <time>December", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("hourmonth", -3.939867031599319),
+                                    ("todayat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>December", -6.07993319509559),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -6.149536101678477),
-                                    ("<time-of-day> am|pmon <day>", -4.896773133183109),
-                                    ("Mondayyear (latent)", -5.456388921118531),
-                                    ("dayday", -4.009469938182206),
-                                    ("on <day>September", -5.456388921118531),
-                                    ("time-of-day (latent)September", -5.744070993570313),
-                                    ("hourhour", -4.0700945599986404),
-                                    ("time-of-day (latent)on <day>", -4.645458704902203),
+                                     -6.07993319509559),
+                                    ("<time-of-day> am|pmon <day>", -4.827170226600222),
+                                    ("Mondayyear (latent)", -5.3867860145356445),
+                                    ("dayday", -3.939867031599319),
+                                    ("on <day>September", -5.3867860145356445),
+                                    ("time-of-day (latent)September", -5.674468086987426),
+                                    ("hourhour", -4.000491653415755),
+                                    ("time-of-day (latent)on <day>", -4.575855798319316),
                                     ("time-of-day (latent)<cycle> after|before <time>",
-                                     -5.744070993570313),
-                                    ("dayyear", -3.1291112155341145),
-                                    ("Thursdaymm/dd", -6.149536101678477),
-                                    ("New Year's Dayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)Sunday", -5.744070993570313),
-                                    ("Thursdayfrom|since|after <time>", -4.444788009440051),
-                                    ("Thursdayat <time-of-day>", -4.540098189244376),
+                                     -5.674468086987426),
+                                    ("dayyear", -3.276572814189055),
+                                    ("Thursdaymm/dd", -6.07993319509559),
+                                    ("New Year's Dayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)Sunday", -5.674468086987426),
+                                    ("Thursdayfrom|since|after <time>", -4.375185102857165),
+                                    ("Thursdayat <time-of-day>", -4.470495282661489),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -6.149536101678477),
-                                    ("Aprilyear (latent)", -6.149536101678477),
-                                    ("the <day-of-month> (ordinal)July", -6.149536101678477),
-                                    ("the <day-of-month> (number)July", -6.149536101678477),
-                                    ("monthminute", -6.149536101678477),
-                                    ("<time-of-day> am|pmtomorrow", -5.744070993570313),
-                                    ("Thursdayhh:mm", -5.2332453698043215),
-                                    ("<day-of-month> (ordinal)Tuesday", -5.744070993570313),
-                                    ("minutemonth", -4.009469938182206),
-                                    ("time-of-day (latent)Friday", -5.744070993570313),
-                                    ("minutehour", -6.149536101678477),
-                                    ("part of daysat <time-of-day>", -5.0509238130103675),
+                                     -6.07993319509559),
+                                    ("Aprilyear (latent)", -6.07993319509559),
+                                    ("the <day-of-month> (ordinal)July", -6.07993319509559),
+                                    ("the <day-of-month> (number)July", -6.07993319509559),
+                                    ("monthminute", -6.07993319509559),
+                                    ("<time-of-day> am|pmtomorrow", -5.674468086987426),
+                                    ("Thursdayhh:mm", -5.163642463221435),
+                                    ("<day-of-month> (ordinal)Tuesday", -5.674468086987426),
+                                    ("minutemonth", -3.939867031599319),
+                                    ("time-of-day (latent)Friday", -5.674468086987426),
+                                    ("minutehour", -6.07993319509559),
+                                    ("part of daysat <time-of-day>", -4.981320906427481),
                                     ("time-of-day (latent)this|last|next <cycle>",
-                                     -3.7981608445149995),
-                                    ("Augustyear (latent)", -5.744070993570313),
-                                    ("week-endin|during <named-month>|year", -6.149536101678477),
-                                    ("time-of-day (latent)Tuesday", -5.744070993570313),
+                                     -3.7285579379321123),
+                                    ("Augustyear (latent)", -5.674468086987426),
+                                    ("week-endin|during <named-month>|year", -6.07993319509559),
+                                    ("time-of-day (latent)Tuesday", -5.674468086987426),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("tonight<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
-                                    ("Sundayyear (latent)", -5.2332453698043215),
-                                    ("hourweek", -5.2332453698043215),
-                                    ("the <day-of-month> (ordinal)Monday", -5.456388921118531),
-                                    ("Christmasat <time-of-day>", -6.149536101678477),
-                                    ("from|since|after <time>year (latent)", -5.0509238130103675),
-                                    ("hhhmmon <day>", -5.2332453698043215),
-                                    ("yesterday<time-of-day> am|pm", -6.149536101678477),
-                                    ("<day-of-month> (ordinal)July", -5.456388921118531),
+                                     -6.07993319509559),
+                                    ("Sundayyear (latent)", -5.163642463221435),
+                                    ("hourweek", -5.163642463221435),
+                                    ("the <day-of-month> (ordinal)Monday", -5.3867860145356445),
+                                    ("Christmasat <time-of-day>", -6.07993319509559),
+                                    ("from|since|after <time>year (latent)", -5.674468086987426),
+                                    ("hhhmmon <day>", -5.163642463221435),
+                                    ("yesterday<time-of-day> am|pm", -6.07993319509559),
+                                    ("<day-of-month> (ordinal)July", -5.3867860145356445),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.149536101678477),
+                                     -6.07993319509559),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -6.149536101678477),
-                                    ("at <time-of-day>intersect", -5.2332453698043215),
-                                    ("hh:mmyear (latent)", -4.763241740558586),
-                                    ("Holiyear (latent)", -6.149536101678477),
-                                    ("until <time><time-of-day> am|pm", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("at <time-of-day>intersect", -5.163642463221435),
+                                    ("Holiyear (latent)", -6.07993319509559),
+                                    ("until <time><time-of-day> am|pm", -6.07993319509559),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.744070993570313),
-                                    ("dayminute", -3.316322757622261),
-                                    ("yyyy-mm-ddhh:mm", -5.744070993570313),
-                                    ("intersectfrom|since|after <time>", -5.744070993570313),
-                                    ("intersectSeptember", -4.277733924776886),
-                                    ("minuteday", -2.9925356805283636),
-                                    ("absorption of , after named dayintersect",
-                                     -6.149536101678477),
-                                    ("intersectyear (latent)", -6.149536101678477),
-                                    ("Februaryin|during the <part-of-day>", -6.149536101678477),
+                                     -5.674468086987426),
+                                    ("dayminute", -3.246719851039374),
+                                    ("yyyy-mm-ddhh:mm", -5.674468086987426),
+                                    ("intersectfrom|since|after <time>", -5.674468086987426),
+                                    ("intersectSeptember", -4.208131018193999),
+                                    ("minuteday", -2.922932773945477),
+                                    ("absorption of , after named dayintersect", -6.07993319509559),
+                                    ("intersectyear (latent)", -6.07993319509559),
+                                    ("Februaryin|during the <part-of-day>", -6.07993319509559),
                                     ("<duration> after|before|from|past <time>December",
-                                     -6.149536101678477),
-                                    ("time-of-day (latent)July", -5.456388921118531),
-                                    ("Saturdayyear (latent)", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("time-of-day (latent)July", -5.3867860145356445),
+                                    ("Saturdayyear (latent)", -6.07993319509559),
                                     ("hhhmmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)Monday", -4.896773133183109),
-                                    ("at <time-of-day>on <day>", -5.2332453698043215),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)Monday", -4.827170226600222),
+                                    ("at <time-of-day>on <day>", -5.163642463221435),
                                     ("absorption of , after named daySeptember",
-                                     -4.896773133183109),
-                                    ("Naraka Chaturdashiyear (latent)", -6.149536101678477),
-                                    ("from|since|after <time>on <day>", -5.2332453698043215),
-                                    ("dayweek", -6.149536101678477),
-                                    ("Easter Sundayyear (latent)", -5.744070993570313),
-                                    ("Thursday<time-of-day> am|pm", -4.896773133183109),
-                                    ("weekyear", -5.744070993570313),
-                                    ("time-of-day (latent)Thursday", -5.744070993570313),
+                                     -4.827170226600222),
+                                    ("Naraka Chaturdashiyear (latent)", -6.07993319509559),
+                                    ("from|since|after <time>on <day>", -5.163642463221435),
+                                    ("dayweek", -6.07993319509559),
+                                    ("Easter Sundayyear (latent)", -5.674468086987426),
+                                    ("Thursday<time-of-day> am|pm", -4.827170226600222),
+                                    ("weekyear", -5.674468086987426),
+                                    ("time-of-day (latent)Thursday", -5.674468086987426),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -6.149536101678477),
-                                    ("<day-of-month> (ordinal)April", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("<day-of-month> (ordinal)April", -6.07993319509559),
                                     ("yyyy-mm-dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.456388921118531),
-                                    ("Sundayfrom|since|after <time>", -6.149536101678477),
-                                    ("absorption of , after named dayFebruary",
-                                     -5.2332453698043215),
+                                     -5.3867860145356445),
+                                    ("Sundayfrom|since|after <time>", -6.07993319509559),
+                                    ("absorption of , after named dayFebruary", -5.163642463221435),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -5.744070993570313),
+                                     -5.674468086987426),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -6.149536101678477),
-                                    ("tomorrowat <time-of-day>", -6.149536101678477),
-                                    ("daynograin", -5.744070993570313),
-                                    ("Fridayin|during <named-month>|year", -6.149536101678477),
+                                     -6.07993319509559),
+                                    ("tomorrowat <time-of-day>", -6.07993319509559),
+                                    ("daynograin", -5.674468086987426),
+                                    ("Fridayin|during <named-month>|year", -6.07993319509559),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.744070993570313),
-                                    ("last <cycle> of <time>year (latent)", -5.744070993570313),
-                                    ("tomorrow<time-of-day> am|pm", -6.149536101678477),
-                                    ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.456388921118531),
-                                    ("Diwaliyear (latent)", -5.744070993570313),
+                                     -5.674468086987426),
+                                    ("last <cycle> of <time>year (latent)", -5.674468086987426),
+                                    ("tomorrow<time-of-day> am|pm", -6.07993319509559),
+                                    ("Diwaliyear (latent)", -5.674468086987426),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -6.149536101678477),
-                                    ("this <part-of-day>at <time-of-day>", -5.2332453698043215),
-                                    ("Fridayyear (latent)", -5.2332453698043215),
-                                    ("time-of-day (latent)April", -6.149536101678477),
-                                    ("minuteyear", -3.9523115243422575)],
-                               n = 318}}),
+                                     -6.07993319509559),
+                                    ("this <part-of-day>at <time-of-day>", -5.163642463221435),
+                                    ("Fridayyear (latent)", -5.163642463221435),
+                                    ("time-of-day (latent)April", -6.07993319509559)],
+                               n = 289}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1737,22 +1725,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.14681486833704485,
-                               unseen = -5.393627546352362,
+                     ClassData{prior = -4.546237407675729e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -2.7779564107075706e-2),
-                                    ("intersect 2 numbers", -4.00277736869661)],
+                                   [("integer (numeric)", -2.320289707966387e-2),
+                                    ("intersect 2 numbers", -3.9982007016691985)],
                                n = 215},
                    koData =
-                     ClassData{prior = -1.9910923718485463,
-                               unseen = -3.6635616461296463,
+                     ClassData{prior = -3.1135153092103742, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.55814461804655),
-                                    ("negative numbers", -0.41871033485818493),
-                                    ("compose by multiplication", -2.2512917986064953)],
-                               n = 34}}),
+                                   [("integer (numeric)", -0.48550781578170077),
+                                    ("compose by multiplication", -1.1786549963416462)],
+                               n = 10}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/HU_XX.hs b/Duckling/Ranking/Classifiers/HU_XX.hs
index 53097cc0a..80f762104 100644
--- a/Duckling/Ranking/Classifiers/HU_XX.hs
+++ b/Duckling/Ranking/Classifiers/HU_XX.hs
@@ -23,17 +23,17 @@ classifiers
   = HashMap.fromList
       [("Thursday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -1.2205021062771466, unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18},
+                     ClassData{prior = -0.6817184847363225, unseen = -3.828641396489095,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 44},
                    koData =
-                     ClassData{prior = -0.3496737484797488,
+                     ClassData{prior = -0.7047080029610213,
                                unseen = -3.8066624897703196,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 43}}),
        ("pm <time-of-day>",
@@ -49,16 +49,17 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.5108256237659907, unseen = -2.995732273553991,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -3.1780538303479458,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.9985288301111273),
-                                    ("todaypart of days", -1.3350010667323402),
-                                    ("tomorrowpart of days", -2.2512917986064953),
-                                    ("yesterdaypart of days", -2.2512917986064953)],
-                               n = 6},
+                                   [("dayhour", -0.9382696385929302),
+                                    ("todaypart of days", -1.1895840668738362),
+                                    ("tomorrowpart of days", -2.4423470353692043),
+                                    ("yesterdaypart of days", -2.4423470353692043)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.916290731874155, unseen = -2.772588722239781,
+                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
                                    [("dayhour", -1.0986122886681098),
@@ -68,8 +69,29 @@ classifiers
                                n = 4}}),
        ("today",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.833213344056216,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("December",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("September",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("October",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -82,12 +104,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("January",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Wednesday",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.70805020110221,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 13},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("November",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("July",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("May",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6},
@@ -96,22 +139,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.713572066704308,
+                     ClassData{prior = -0.3629054936893685,
+                               unseen = -3.8066624897703196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.0498221244986778),
-                                    ("yyyy.mm.ddhh:mm", -2.995732273553991),
-                                    ("Wednesdaypm <time-of-day>", -2.3025850929940455),
-                                    ("todaypart of days", -2.0794415416798357),
-                                    ("yyyy.mm.ddpm <time-of-day>", -2.995732273553991),
-                                    ("dayminute", -2.995732273553991),
-                                    ("tomorrowpart of days", -2.995732273553991),
-                                    ("next <day-of-week>pm <time-of-day>", -2.3025850929940455),
-                                    ("yesterdaypart of days", -2.995732273553991)],
-                               n = 14},
-                   koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -3.295836866004329,
+                                   [("dayhour", -1.0116009116784799),
+                                    ("yyyy.mm.ddhh:mm", -3.0910424533583156),
+                                    ("Wednesdaypm <time-of-day>", -2.3978952727983707),
+                                    ("todaypart of days", -1.8382794848629478),
+                                    ("yyyy.mm.ddpm <time-of-day>", -3.0910424533583156),
+                                    ("dayminute", -3.0910424533583156),
+                                    ("tomorrowpart of days", -3.0910424533583156),
+                                    ("next <day-of-week>pm <time-of-day>", -2.3978952727983707),
+                                    ("yesterdaypart of days", -3.0910424533583156)],
+                               n = 16},
+                   koData =
+                     ClassData{prior = -1.1895840668738362, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
                                    [("dayhour", -1.1786549963416462),
@@ -127,24 +170,31 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("day before yesterday",
+       ("Saturday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("Monday",
+       ("day before yesterday",
         Classifier{okData =
                      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}}),
+       ("Monday",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("yesterday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -155,6 +205,13 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
+       ("April",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("am <time-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
@@ -168,15 +225,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("end of month",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("Friday",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("tomorrow",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -206,8 +270,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Sunday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3},
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("June",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("February",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -228,8 +306,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("March",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                     ClassData{prior = 0.0, unseen = -3.713572066704308,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 39},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -249,33 +327,35 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("Tuesday",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month> (non ordinal)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
+                     ClassData{prior = 0.0, unseen = -4.74493212836325,
                                likelihoods =
                                  HashMap.fromList
                                    [("Marchinteger (numeric)", -0.6931471805599453),
                                     ("month", -0.6931471805599453)],
-                               n = 5},
+                               n = 56},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("ordinal (digits)",
         Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0},
+                     ClassData{prior = -2.0794415416798357,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
                    koData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -2.1972245773362196,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
        ("seasons",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                     ClassData{prior = 0.0, unseen = -2.890371757896165,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 16},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -288,31 +368,48 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("right now",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("end of year",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("day after tomorrow",
         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}}),
        ("part of days",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                     ClassData{prior = -0.17589066646366416,
+                               unseen = -3.332204510175204,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 26},
+                   koData =
+                     ClassData{prior = -1.824549292051046, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
+       ("<named-month> <day-of-month> (ordinal)",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("month", -0.6931471805599453),
+                                    ("Marchordinal (digits)", -0.6931471805599453)],
+                               n = 1},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5}})]
\ No newline at end of file
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("August",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}})]
\ No newline at end of file
diff --git a/Duckling/Ranking/Classifiers/NB_XX.hs b/Duckling/Ranking/Classifiers/NB_XX.hs
index 83e8e28b7..89b9b2e00 100644
--- a/Duckling/Ranking/Classifiers/NB_XX.hs
+++ b/Duckling/Ranking/Classifiers/NB_XX.hs
@@ -78,24 +78,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.45198512374305727,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = 0.0, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -0.9650808960435872),
-                                    ("tomorrowevening", -1.9459101490553135),
-                                    ("tomorrowlunch", -1.9459101490553135),
-                                    ("yesterdayevening", -2.3513752571634776),
-                                    ("Mandagmorning", -1.9459101490553135)],
+                                   [("dayhour", -0.8649974374866046),
+                                    ("tomorrowevening", -1.845826690498331),
+                                    ("tomorrowlunch", -1.845826690498331),
+                                    ("yesterdayevening", -2.2512917986064953),
+                                    ("Mandagmorning", -1.845826690498331)],
                                n = 7},
                    koData =
-                     ClassData{prior = -1.0116009116784799, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("yearhour", -1.0986122886681098),
-                                    ("year (latent)in|during the <part-of-day>",
-                                     -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -0.5108256237659907, unseen = -2.639057329615259,
@@ -558,9 +552,9 @@ classifiers
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 5}}),
+                               n = 1}}),
        ("Mandag",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.70805020110221,
diff --git a/Duckling/Ranking/Classifiers/PT_XX.hs b/Duckling/Ranking/Classifiers/PT_XX.hs
index b7631aa7a..f92d5c0ad 100644
--- a/Duckling/Ranking/Classifiers/PT_XX.hs
+++ b/Duckling/Ranking/Classifiers/PT_XX.hs
@@ -217,7 +217,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by `da` or `de`",
         Classifier{okData =
-                     ClassData{prior = -1.9209712007080613, unseen = -4.912654885736052,
+                     ClassData{prior = -1.9108188292440431, unseen = -4.912654885736052,
                                likelihoods =
                                  HashMap.fromList
                                    [("daymonth", -2.959364629383116),
@@ -253,87 +253,86 @@ classifiers
                                      -4.212127597878484)],
                                n = 29},
                    koData =
-                     ClassData{prior = -0.15836831577146182,
-                               unseen = -6.030685260261263,
+                     ClassData{prior = -0.16012084681376212,
+                               unseen = -6.021023349349527,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)<datetime> - <datetime> (interval)",
-                                     -4.929666231562589),
-                                    ("hourday", -3.195065176174482),
-                                    ("year (latent)Abril", -4.929666231562589),
-                                    ("year (latent)Julho", -3.3892211906154395),
-                                    ("dayhour", -5.3351313396707525),
-                                    ("time-of-day (latent)Fevereiro", -3.948836978550862),
-                                    ("monthday", -4.641984159110808),
-                                    ("monthyear", -3.6303832474323277),
-                                    ("yearhour", -3.8310539428944788),
+                                     -4.919980925828125),
+                                    ("hourday", -3.1853798704400185),
+                                    ("year (latent)Abril", -4.919980925828125),
+                                    ("year (latent)Julho", -3.5336865647082343),
+                                    ("dayhour", -5.32544603393629),
+                                    ("time-of-day (latent)Fevereiro", -3.9391516728163984),
+                                    ("monthday", -4.632298853376344),
+                                    ("monthyear", -3.620697941697864),
+                                    ("yearhour", -3.821368637160015),
                                     ("entre <datetime> e <datetime> (interval)Julho",
-                                     -3.7256934272366524),
-                                    ("houryear", -3.3892211906154395),
-                                    ("year (latent)Maio", -4.236519051002643),
+                                     -3.7160081215021887),
+                                    ("houryear", -3.379535884880976),
+                                    ("year (latent)Maio", -4.22683374526818),
                                     ("time-of-day (latent)two time tokens separated by \",\"2",
-                                     -4.929666231562589),
-                                    ("Setembroyear", -4.236519051002643),
-                                    ("time-of-day (latent)Setembro", -4.236519051002643),
-                                    ("time-of-day (latent)intersect", -3.3202283191284883),
-                                    ("year (latent)<time-of-day> <part-of-day>",
-                                     -5.3351313396707525),
-                                    ("\224s <time-of-day>Julho", -4.641984159110808),
-                                    ("year (latent)intersect", -4.236519051002643),
-                                    ("Setembrointersect", -5.3351313396707525),
+                                     -4.919980925828125),
+                                    ("Setembroyear", -4.22683374526818),
+                                    ("time-of-day (latent)Setembro", -4.22683374526818),
+                                    ("time-of-day (latent)intersect", -3.3105430133940246),
+                                    ("year (latent)<time-of-day> <part-of-day>", -5.32544603393629),
+                                    ("\224s <time-of-day>Julho", -4.632298853376344),
+                                    ("year (latent)intersect", -4.22683374526818),
+                                    ("Setembrointersect", -5.32544603393629),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"",
-                                     -5.3351313396707525),
+                                     -5.32544603393629),
                                     ("year (latent)amanh\227 pela <part-of-day>",
-                                     -5.3351313396707525),
-                                    ("hourmonth", -1.7797832781813394),
+                                     -5.32544603393629),
+                                    ("hourmonth", -1.7700979724468757),
                                     ("time-of-day (latent)intersect by `da` or `de`",
-                                     -3.543371870442698),
-                                    ("monthmonth", -5.3351313396707525),
+                                     -3.5336865647082343),
+                                    ("monthmonth", -5.32544603393629),
                                     ("Setembrotwo time tokens separated by \",\"2",
-                                     -5.3351313396707525),
-                                    ("year (latent)Fevereiro", -3.948836978550862),
-                                    ("time-of-day (latent)Dezembro", -5.3351313396707525),
-                                    ("dayyear", -5.3351313396707525),
-                                    ("time-of-day (latent)Julho", -3.543371870442698),
-                                    ("time-of-day (latent)Abril", -4.929666231562589),
-                                    ("passado <cycle>year", -5.3351313396707525),
-                                    ("year (latent)<dim time> da manha", -5.3351313396707525),
+                                     -5.32544603393629),
+                                    ("year (latent)Fevereiro", -3.9391516728163984),
+                                    ("time-of-day (latent)Dezembro", -5.32544603393629),
+                                    ("dayyear", -5.32544603393629),
+                                    ("time-of-day (latent)Julho", -3.5336865647082343),
+                                    ("time-of-day (latent)Abril", -4.919980925828125),
+                                    ("passado <cycle>year", -5.32544603393629),
+                                    ("year (latent)<dim time> da manha", -5.32544603393629),
                                     ("<day-of-month> (ordinal or number) de <named-month>year",
-                                     -5.3351313396707525),
-                                    ("time-of-day (latent)Mar\231o", -4.236519051002643),
-                                    ("year (latent)Janeiro", -5.3351313396707525),
-                                    ("year (latent)Dezembro", -5.3351313396707525),
+                                     -5.32544603393629),
+                                    ("time-of-day (latent)Mar\231o", -4.22683374526818),
+                                    ("year (latent)Janeiro", -5.32544603393629),
+                                    ("year (latent)Dezembro", -5.32544603393629),
                                     ("entre <datetime> e <datetime> (interval)Janeiro",
-                                     -5.3351313396707525),
-                                    ("yearmonth", -2.1996371237416033),
-                                    ("two time tokens separated by \",\"2year", -4.929666231562589),
+                                     -5.32544603393629),
+                                    ("yearmonth", -2.2344035805779736),
+                                    ("two time tokens separated by \",\"2year", -4.919980925828125),
                                     ("Setembrotwo time tokens separated by \",\"",
-                                     -5.3351313396707525),
-                                    ("intersect by `da` or `de`intersect", -5.3351313396707525),
-                                    ("intersectyear", -5.3351313396707525),
+                                     -5.32544603393629),
+                                    ("intersect by `da` or `de`intersect", -5.32544603393629),
+                                    ("intersectyear", -5.32544603393629),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"2",
-                                     -5.3351313396707525),
-                                    ("time-of-day (latent)Maio", -4.236519051002643),
-                                    ("antes das <time-of-day>Julho", -4.082368371175385),
-                                    ("Maioyear", -4.641984159110808),
-                                    ("year (latent)Setembro", -4.236519051002643),
-                                    ("\224s <time-of-day>Janeiro", -5.3351313396707525),
-                                    ("two time tokens separated by \",\"year", -4.929666231562589),
+                                     -5.32544603393629),
+                                    ("time-of-day (latent)Maio", -4.22683374526818),
+                                    ("antes das <time-of-day>Julho", -4.072683065440922),
+                                    ("Maioyear", -4.632298853376344),
+                                    ("year (latent)Setembro", -4.22683374526818),
+                                    ("\224s <time-of-day>Janeiro", -5.32544603393629),
+                                    ("two time tokens separated by \",\"year", -4.919980925828125),
                                     ("time-of-day (latent)two time tokens separated by \",\"",
-                                     -4.929666231562589),
-                                    ("intersect by `da` or `de`year", -3.8310539428944788),
+                                     -4.919980925828125),
+                                    ("intersect by `da` or `de`year", -3.821368637160015),
                                     ("year (latent)<datetime> - <datetime> (interval)",
-                                     -4.929666231562589),
-                                    ("yearday", -5.3351313396707525),
-                                    ("time-of-day (latent)Janeiro", -5.3351313396707525),
+                                     -4.919980925828125),
+                                    ("yearday", -5.32544603393629),
+                                    ("time-of-day (latent)Janeiro", -5.32544603393629),
                                     ("dia <day-of-month> (non ordinal)intersect",
-                                     -5.3351313396707525),
-                                    ("Julhoyear", -5.3351313396707525),
+                                     -5.32544603393629),
+                                    ("Julhoyear", -5.32544603393629),
                                     ("de <datetime> - <datetime> (interval)Julho",
-                                     -5.3351313396707525),
-                                    ("year (latent)Mar\231o", -4.236519051002643),
-                                    ("yearminute", -5.3351313396707525)],
-                               n = 169}}),
+                                     -5.32544603393629),
+                                    ("year (latent)Mar\231o", -4.22683374526818),
+                                    ("yearminute", -5.32544603393629)],
+                               n = 167}}),
        ("<hour-of-day> and half",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -779,17 +778,16 @@ classifiers
                                n = 20}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -4.204692619390966,
+                     ClassData{prior = 0.0, unseen = -4.1588830833596715,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.40546510810816444),
-                                    ("integer (0..19)", -1.3564413979702095),
-                                    ("negative numbers", -3.0910424533583156),
-                                    ("tens (20..90)", -3.4965075614664802)],
-                               n = 62}}),
+                                   [("integer (numeric)", -0.35894509247327155),
+                                    ("integer (0..19)", -1.3099213823353166),
+                                    ("tens (20..90)", -3.4499875458315876)],
+                               n = 60}}),
        ("n[ao] <date>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
diff --git a/Duckling/Ranking/Classifiers/RU_XX.hs b/Duckling/Ranking/Classifiers/RU_XX.hs
index 9cd5837a3..0035d26b3 100644
--- a/Duckling/Ranking/Classifiers/RU_XX.hs
+++ b/Duckling/Ranking/Classifiers/RU_XX.hs
@@ -21,7 +21,14 @@ import Duckling.Ranking.Types
 classifiers :: Classifiers
 classifiers
   = HashMap.fromList
-      [("week",
+      [("midnight",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
+       ("week",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1},
@@ -30,12 +37,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082",
         Classifier{okData =
-                     ClassData{prior = -0.1823215567939546,
-                               unseen = -1.9459101490553135,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
-                     ClassData{prior = -1.791759469228055, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> timezone",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
@@ -49,20 +55,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.8009798853631607, unseen = -4.634728988229636,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 101},
+                     ClassData{prior = -0.7865811872060422, unseen = -4.59511985013459,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 97},
                    koData =
-                     ClassData{prior = -0.5958188365993833, unseen = -4.836281906951478,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 124}}),
+                     ClassData{prior = -0.6077019746030605, unseen = -4.770684624465665,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 116}}),
        ("\1057\1088\1077\1076\1072",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (3..19)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -89,8 +93,8 @@ classifiers
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6}}),
        ("\1074\1095\1077\1088\1072",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -100,52 +104,49 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.20909179785855936,
-                               unseen = -4.770684624465665,
+                     ClassData{prior = -0.1568424714929697, unseen = -4.919980925828125,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time-of-day>  o'clockmorning", -3.6635616461296463),
-                                    ("until <time-of-day>afternoon", -4.069026754237811),
-                                    ("dayhour", -2.816263785742443),
-                                    ("on <date>evening", -4.069026754237811),
-                                    ("at <time-of-day>evening", -4.069026754237811),
-                                    ("intersect by ','evening", -3.6635616461296463),
-                                    ("intersectevening", -2.277267285009756),
-                                    ("hourhour", -1.2656663733312759),
-                                    ("\1079\1072\1074\1090\1088\1072lunch", -4.069026754237811),
-                                    ("on <date>afternoon", -3.6635616461296463),
-                                    ("at <time-of-day>afternoon", -3.6635616461296463),
-                                    ("<time-of-day>  o'clockafternoon", -2.9704144655697013),
-                                    ("until <time-of-day>morning", -4.069026754237811),
-                                    ("minutehour", -2.9704144655697013),
-                                    ("time-of-day (latent)morning", -4.069026754237811),
-                                    ("hh:mmmorning", -4.069026754237811),
-                                    ("\1074\1095\1077\1088\1072evening", -4.069026754237811),
-                                    ("time-of-day (latent)evening", -4.069026754237811),
-                                    ("\1079\1072\1074\1090\1088\1072evening", -4.069026754237811),
+                                   [("<time-of-day>  o'clockmorning", -3.8140425970679424),
+                                    ("until <time-of-day>afternoon", -4.219507705176107),
+                                    ("dayhour", -2.966744736680739),
+                                    ("on <date>evening", -4.219507705176107),
+                                    ("at <time-of-day>evening", -4.219507705176107),
+                                    ("intersect by ','evening", -3.8140425970679424),
+                                    ("intersectevening", -2.4277482359480516),
+                                    ("hourhour", -1.1514547700424895),
+                                    ("\1079\1072\1074\1090\1088\1072lunch", -4.219507705176107),
+                                    ("on <date>afternoon", -3.3032169733019514),
+                                    ("at <time-of-day>afternoon", -3.3032169733019514),
+                                    ("<time-of-day>  o'clockafternoon", -2.4277482359480516),
+                                    ("until <time-of-day>morning", -4.219507705176107),
+                                    ("minutehour", -3.120895416507997),
+                                    ("time-of-day (latent)morning", -4.219507705176107),
+                                    ("hh:mmmorning", -4.219507705176107),
+                                    ("\1074\1095\1077\1088\1072evening", -4.219507705176107),
+                                    ("time-of-day (latent)evening", -4.219507705176107),
+                                    ("\1079\1072\1074\1090\1088\1072evening", -4.219507705176107),
                                     ("\1089\1077\1075\1086\1076\1085\1103afternoon",
-                                     -3.6635616461296463),
-                                    ("<time-of-day>  o'clockevening", -3.6635616461296463),
+                                     -3.8140425970679424),
+                                    ("<time-of-day>  o'clockevening", -3.8140425970679424),
                                     ("\1089\1077\1075\1086\1076\1085\1103evening",
-                                     -4.069026754237811),
-                                    ("hh:mmnight", -4.069026754237811),
-                                    ("hh:mmafternoon", -4.069026754237811),
-                                    ("on <date>morning", -4.069026754237811),
-                                    ("at <time-of-day>morning", -4.069026754237811)],
-                               n = 43},
-                   koData =
-                     ClassData{prior = -1.667706820558076, unseen = -3.951243718581427,
+                                     -4.219507705176107),
+                                    ("hh:mmnight", -4.219507705176107),
+                                    ("hh:mmafternoon", -4.219507705176107),
+                                    ("on <date>morning", -4.219507705176107),
+                                    ("at <time-of-day>morning", -4.219507705176107)],
+                               n = 53},
+                   koData =
+                     ClassData{prior = -1.929909807708872, unseen = -3.891820298110627,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -3.2386784521643803),
-                                    ("yearhour", -2.833213344056216),
-                                    ("intersectevening", -2.5455312716044354),
-                                    ("hourhour", -1.8523840910444898),
-                                    ("<day-of-month> (ordinal)morning", -3.2386784521643803),
-                                    ("year (latent)afternoon", -3.2386784521643803),
-                                    ("year (latent)night", -3.2386784521643803),
-                                    ("time-of-day (latent)afternoon", -2.322387720290225)],
-                               n = 10}}),
+                                   [("yearhour", -2.772588722239781),
+                                    ("intersectevening", -2.4849066497880004),
+                                    ("hourhour", -1.791759469228055),
+                                    ("year (latent)afternoon", -3.1780538303479458),
+                                    ("year (latent)night", -3.1780538303479458),
+                                    ("time-of-day (latent)afternoon", -2.2617630984737906)],
+                               n = 9}}),
        ("numbers prefix with -, minus",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -167,20 +168,22 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 13}}),
        ("at <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -8.4557388028063e-2, unseen = -4.31748811353631,
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -4.382026634673881,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time-of-day>  o'clock", -1.8191584434161694),
-                                    ("time-of-day (latent)", -1.3083328196501787),
-                                    ("hh:mm", -2.917770732084279), ("noon", -3.6109179126442243),
-                                    ("hour", -0.8383291904044432), ("minute", -2.917770732084279)],
-                               n = 34},
-                   koData =
-                     ClassData{prior = -2.512305623976115, unseen = -2.5649493574615367,
+                                   [("midnight", -3.676300671907076),
+                                    ("<time-of-day>  o'clock", -1.8044984950054848),
+                                    ("time-of-day (latent)", -1.3737155789130304),
+                                    ("hh:mm", -2.9831534913471307), ("noon", -3.676300671907076),
+                                    ("hour", -0.84308732785086), ("minute", -2.9831534913471307)],
+                               n = 36},
+                   koData =
+                     ClassData{prior = -2.5649493574615367, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.0986122886681098),
-                                    ("hour", -1.0986122886681098)],
+                                   [("time-of-day (latent)", -1.1786549963416462),
+                                    ("hour", -1.1786549963416462)],
                                n = 3}}),
        ("absorption of , after named day",
         Classifier{okData =
@@ -201,27 +204,39 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("on <date>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -4.653960350157523,
+                     ClassData{prior = -1.5748356968139168e-2,
+                               unseen = -4.990432586778736,
                                likelihoods =
                                  HashMap.fromList
-                                   [("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082",
-                                     -3.951243718581427),
-                                    ("<time> <part-of-day>", -3.0349529867072724),
-                                    ("<time-of-day>  o'clock", -2.159484249353372),
-                                    ("intersect", -2.5649493574615367),
-                                    ("day", -2.6984807500860595),
-                                    ("time-of-day (latent)", -2.005333569526114),
-                                    ("\1057\1091\1073\1073\1086\1090\1072", -3.545778610473263),
-                                    ("hh:mm", -3.258096538021482),
-                                    ("\1042\1090\1086\1088\1085\1080\1082", -3.951243718581427),
-                                    ("\1055\1103\1090\1085\1080\1094\1072", -3.951243718581427),
-                                    ("noon", -3.951243718581427), ("hour", -1.0608719606852628),
-                                    ("this|next <day-of-week>", -3.951243718581427),
-                                    ("minute", -3.0349529867072724)],
-                               n = 45},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -2.70805020110221,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                                   [("midnight", -4.290459441148391),
+                                    ("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082",
+                                     -4.290459441148391),
+                                    ("<time> <part-of-day>", -3.0376964726530233),
+                                    ("<time-of-day>  o'clock", -2.4186572642467996),
+                                    ("<ordinal> quarter", -4.290459441148391),
+                                    ("intersect", -2.4186572642467996),
+                                    ("<day-of-month>(ordinal) <named-month>", -3.884994333040227),
+                                    ("day", -2.039167642541896), ("quarter", -4.290459441148391),
+                                    ("time-of-day (latent)", -2.2755564206061263),
+                                    ("\1057\1091\1073\1073\1086\1090\1072", -3.884994333040227),
+                                    ("hh:mm", -3.597312260588446),
+                                    ("\1042\1090\1086\1088\1085\1080\1082", -4.290459441148391),
+                                    ("\1055\1103\1090\1085\1080\1094\1072", -4.290459441148391),
+                                    ("<day-of-month> (ordinal)", -3.884994333040227),
+                                    ("noon", -4.290459441148391), ("hour", -1.2700345550040286),
+                                    ("this|next <day-of-week>", -3.597312260588446),
+                                    ("<day-of-month>(ordinal) <named-month> year",
+                                     -4.290459441148391),
+                                    ("minute", -3.3741687092742363)],
+                               n = 63},
+                   koData =
+                     ClassData{prior = -4.1588830833596715,
+                               unseen = -3.1354942159291497,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("day", -2.3978952727983707),
+                                    ("<day-of-month> (ordinal)", -2.3978952727983707)],
+                               n = 1}}),
        ("\1050\1086\1085\1077\1094 \1084\1077\1089\1103\1094\1072",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -257,27 +272,28 @@ classifiers
                                n = 1}}),
        ("month (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.1823215567939546,
-                               unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
+                     ClassData{prior = -8.004270767353637e-2,
+                               unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.791759469228055, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+                     ClassData{prior = -2.5649493574615367,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<time-of-day>  o'clock",
         Classifier{okData =
-                     ClassData{prior = -0.13102826240640414,
-                               unseen = -4.672828834461907,
+                     ClassData{prior = -0.12629372532429212,
+                               unseen = -4.709530201312334,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>", -2.178532444324067),
-                                    ("on <date>", -2.178532444324067),
-                                    ("time-of-day (latent)", -1.5279448781829175),
-                                    ("until <time-of-day>", -3.2771447329921766),
-                                    ("hour", -0.7316134613877414),
-                                    ("after <time-of-day>", -3.2771447329921766)],
-                               n = 50},
-                   koData =
-                     ClassData{prior = -2.097141118779237, unseen = -3.044522437723423,
+                                   [("at <time-of-day>", -2.1355310083308794),
+                                    ("on <date>", -2.1355310083308794),
+                                    ("time-of-day (latent)", -1.5649861498632667),
+                                    ("until <time-of-day>", -3.3141860046725258),
+                                    ("hour", -0.7301884522402944),
+                                    ("after <time-of-day>", -3.3141860046725258)],
+                               n = 52},
+                   koData =
+                     ClassData{prior = -2.1316272948504063, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -0.916290731874155),
@@ -314,196 +330,177 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 27}}),
        ("<ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.6094379124341003,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..19th)quarter (grain)", -0.6931471805599453),
-                                    ("quarter", -0.6931471805599453)],
-                               n = 1},
+                                   [("quarter", -0.6931471805599453),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)quarter (grain)",
+                                     -0.6931471805599453)],
+                               n = 2},
                    koData =
-                     ClassData{prior = -0.40546510810816444,
+                     ClassData{prior = -0.6931471805599453,
                                unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..19th)quarter (grain)", -0.6931471805599453),
-                                    ("quarter", -0.6931471805599453)],
+                                   [("quarter", -0.6931471805599453),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)quarter (grain)",
+                                     -0.6931471805599453)],
                                n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.18924199963852842,
-                               unseen = -6.056784013228625,
+                     ClassData{prior = -0.16799173123912972,
+                               unseen = -6.028278520230698,
                                likelihoods =
                                  HashMap.fromList
-                                   [("\1057\1088\1077\1076\1072\1054\1082\1090\1103\1073\1088\1100",
-                                     -4.955827057601261),
-                                    ("\1089\1077\1075\1086\1076\1085\1103on <date>",
-                                     -4.66814498514948),
+                                   [("\1089\1077\1075\1086\1076\1085\1103on <date>",
+                                     -4.639571612705423),
                                     ("<day-of-month> (ordinal)\1040\1074\1075\1091\1089\1090",
-                                     -5.3612921657094255),
-                                    ("hourday", -4.108529197214057),
-                                    ("<datetime> - <datetime> (interval)year", -5.3612921657094255),
+                                     -5.332718793265369),
+                                    ("hourday", -4.079955824770001),
+                                    ("<datetime> - <datetime> (interval)year", -5.332718793265369),
                                     ("\1063\1077\1090\1074\1077\1088\1075<time> timezone",
-                                     -4.955827057601261),
-                                    ("hh:mm<part-of-day> of <time>", -4.44500143383527),
-                                    ("dayhour", -2.204291744559312),
-                                    ("daymonth", -2.4168531865429848),
-                                    ("monthyear", -3.4894899888078337),
-                                    ("yearhour", -5.3612921657094255),
-                                    ("intersect<time-of-day>  o'clock", -4.44500143383527),
+                                     -4.927253685157205),
+                                    ("hh:mm<part-of-day> of <time>", -4.416428061391214),
+                                    ("dayhour", -2.1757183721152558),
+                                    ("daymonth", -2.336986519711378),
+                                    ("monthyear", -3.627970701026944),
+                                    ("yearhour", -5.332718793265369),
+                                    ("intersect<time-of-day>  o'clock", -4.416428061391214),
                                     ("absorption of , after named daymm/dd/yyyy",
-                                     -5.3612921657094255),
-                                    ("intersect<time> <part-of-day>", -4.44500143383527),
-                                    ("intersect by ','year", -4.955827057601261),
+                                     -5.332718793265369),
+                                    ("intersect<time> <part-of-day>", -4.416428061391214),
+                                    ("intersect by ','year", -4.927253685157205),
                                     ("<day-of-month> (ordinal)\1060\1077\1074\1088\1072\1083\1100",
-                                     -3.4153820166541116),
-                                    ("on <date><time-of-day>  o'clock", -4.955827057601261),
+                                     -3.253277251585533),
+                                    ("on <date><time-of-day>  o'clock", -4.927253685157205),
                                     ("<day-of-month> (ordinal)\1054\1082\1090\1103\1073\1088\1100",
-                                     -4.955827057601261),
-                                    ("mm/dd<time-of-day>  o'clock", -4.955827057601261),
-                                    ("<day-of-month> (ordinal)\1042\1090\1086\1088\1085\1080\1082",
-                                     -5.3612921657094255),
-                                    ("on <date>at <time-of-day>", -4.66814498514948),
-                                    ("\1079\1072\1074\1090\1088\1072on <date>",
-                                     -5.3612921657094255),
-                                    ("dayday", -3.0587070727153796),
+                                     -4.927253685157205),
+                                    ("mm/dd<time-of-day>  o'clock", -4.927253685157205),
+                                    ("on <date>at <time-of-day>", -4.639571612705423),
+                                    ("\1079\1072\1074\1090\1088\1072on <date>", -5.332718793265369),
+                                    ("dayday", -3.317815772723104),
                                     ("at <time-of-day>\1079\1072\1074\1090\1088\1072",
-                                     -5.3612921657094255),
-                                    ("mm/ddat <time-of-day>", -4.955827057601261),
-                                    ("<day-of-month> (ordinal)intersect", -3.6565440734709997),
-                                    ("on <date>\1079\1072\1074\1090\1088\1072",
-                                     -5.3612921657094255),
-                                    ("hh:mmintersect by ','", -5.3612921657094255),
+                                     -5.332718793265369),
+                                    ("mm/ddat <time-of-day>", -4.927253685157205),
+                                    ("<day-of-month> (ordinal)intersect", -3.828641396489095),
+                                    ("on <date>\1079\1072\1074\1090\1088\1072", -5.332718793265369),
+                                    ("hh:mmintersect by ','", -5.332718793265369),
                                     ("<day-of-month> (ordinal)\1040\1087\1088\1077\1083\1100",
-                                     -5.3612921657094255),
+                                     -5.332718793265369),
                                     ("<day-of-month> (ordinal)\1052\1072\1088\1090",
-                                     -4.2626798770413155),
+                                     -4.079955824770001),
                                     ("intersect<day-of-month> (non ordinal) <named-month>",
-                                     -4.955827057601261),
-                                    ("dayyear", -2.653241964607215),
+                                     -4.927253685157205),
+                                    ("dayyear", -2.560130071025588),
                                     ("<day-of-month> (non ordinal) <named-month>intersect",
-                                     -5.3612921657094255),
-                                    ("\1057\1077\1085\1090\1103\1073\1088\1100year",
-                                     -5.3612921657094255),
+                                     -5.332718793265369),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -3.9749978045895347),
-                                    ("\1053\1086\1103\1073\1088\1100year", -5.3612921657094255),
+                                     -3.828641396489095),
+                                    ("\1053\1086\1103\1073\1088\1100year", -5.332718793265369),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -5.3612921657094255),
-                                    ("minutehour", -4.108529197214057),
+                                     -5.332718793265369),
+                                    ("minutehour", -4.079955824770001),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -3.9749978045895347),
-                                    ("\1057\1088\1077\1076\1072intersect", -5.3612921657094255),
-                                    ("<day-of-month> (ordinal)\1057\1088\1077\1076\1072",
-                                     -5.3612921657094255),
+                                     -3.9464244321454784),
                                     ("\1089\1077\1075\1086\1076\1085\1103<time> <part-of-day>",
-                                     -4.955827057601261),
-                                    ("<day-of-month> (ordinal)\1052\1072\1081",
-                                     -5.3612921657094255),
+                                     -4.927253685157205),
+                                    ("<day-of-month> (ordinal)\1052\1072\1081", -5.332718793265369),
                                     ("\1089\1077\1075\1086\1076\1085\1103at <time-of-day>",
-                                     -4.44500143383527),
-                                    ("hh:mmintersect", -5.3612921657094255),
-                                    ("\1054\1082\1090\1103\1073\1088\1100year",
-                                     -4.2626798770413155),
-                                    ("intersect by ','intersect", -5.3612921657094255),
+                                     -4.416428061391214),
+                                    ("hh:mmintersect", -5.332718793265369),
+                                    ("\1054\1082\1090\1103\1073\1088\1100year", -4.639571612705423),
+                                    ("on <date>\1060\1077\1074\1088\1072\1083\1100",
+                                     -5.332718793265369),
+                                    ("intersect by ','intersect", -5.332718793265369),
                                     ("absorption of , after named day<day-of-month> (ordinal)",
-                                     -5.3612921657094255),
-                                    ("dayminute", -4.44500143383527),
-                                    ("<time> <part-of-day>intersect", -5.3612921657094255),
+                                     -5.332718793265369),
+                                    ("dayminute", -4.416428061391214),
+                                    ("<time> <part-of-day>intersect", -5.332718793265369),
                                     ("intersect by ','\1060\1077\1074\1088\1072\1083\1100",
-                                     -5.3612921657094255),
-                                    ("intersectyear", -3.4894899888078337),
-                                    ("\1040\1087\1088\1077\1083\1100year", -5.3612921657094255),
-                                    ("minuteday", -4.108529197214057),
-                                    ("absorption of , after named dayintersect",
-                                     -4.2626798770413155),
+                                     -5.332718793265369),
+                                    ("intersectyear", -3.5409593240373143),
+                                    ("\1040\1087\1088\1077\1083\1100year", -5.332718793265369),
+                                    ("on <date>intersect", -5.332718793265369),
+                                    ("minuteday", -4.079955824770001),
+                                    ("absorption of , after named dayintersect", -4.23410650459726),
                                     ("\1079\1072\1074\1090\1088\1072<time-of-day>  o'clock",
-                                     -4.955827057601261),
+                                     -4.927253685157205),
                                     ("intersect\1060\1077\1074\1088\1072\1083\1100",
-                                     -5.3612921657094255),
-                                    ("year<time-of-day>  o'clock", -5.3612921657094255),
-                                    ("intersect\1054\1082\1090\1103\1073\1088\1100",
-                                     -5.3612921657094255),
+                                     -5.332718793265369),
+                                    ("year<time-of-day>  o'clock", -5.332718793265369),
                                     ("<time-of-day>  o'clock\1079\1072\1074\1090\1088\1072",
-                                     -4.66814498514948),
+                                     -4.639571612705423),
                                     ("\1057\1091\1073\1073\1086\1090\1072on <date>",
-                                     -5.3612921657094255),
-                                    ("intersect by ','<time> <part-of-day>", -5.3612921657094255),
+                                     -5.332718793265369),
+                                    ("intersect by ','<time> <part-of-day>", -5.332718793265369),
                                     ("\1057\1091\1073\1073\1086\1090\1072at <time-of-day>",
-                                     -4.66814498514948),
-                                    ("<time> <part-of-day>intersect by ','", -5.3612921657094255),
+                                     -4.639571612705423),
+                                    ("<time> <part-of-day>intersect by ','", -5.332718793265369),
                                     ("<time> <part-of-day>\1057\1091\1073\1073\1086\1090\1072",
-                                     -5.3612921657094255),
+                                     -5.332718793265369),
                                     ("\1042\1090\1086\1088\1085\1080\1082next <cycle>",
-                                     -5.3612921657094255),
-                                    ("mm/ddyear", -4.955827057601261),
-                                    ("intersect by ','<time-of-day>  o'clock", -5.3612921657094255),
-                                    ("absorption of , after named daymm/dd", -5.3612921657094255),
-                                    ("mm/ddon <date>", -5.3612921657094255),
+                                     -5.332718793265369),
+                                    ("mm/ddyear", -4.927253685157205),
+                                    ("intersect by ','<time-of-day>  o'clock", -5.332718793265369),
+                                    ("absorption of , after named daymm/dd", -5.332718793265369),
+                                    ("mm/ddon <date>", -5.332718793265369),
                                     ("<time> <part-of-day>absorption of , after named day",
-                                     -5.3612921657094255),
-                                    ("intersectintersect", -4.955827057601261),
+                                     -5.332718793265369),
+                                    ("on <date>year", -4.927253685157205),
+                                    ("intersectintersect", -5.332718793265369),
                                     ("<part-of-day> of <time><day-of-month> (non ordinal) <named-month>",
-                                     -5.3612921657094255),
+                                     -5.332718793265369),
                                     ("\1057\1091\1073\1073\1086\1090\1072<time-of-day>  o'clock",
-                                     -4.955827057601261),
-                                    ("on <date>on <date>", -5.3612921657094255),
-                                    ("dayweek", -5.3612921657094255),
+                                     -4.927253685157205),
+                                    ("on <date>on <date>", -5.332718793265369),
+                                    ("dayweek", -5.332718793265369),
                                     ("\1079\1072\1074\1090\1088\1072at <time-of-day>",
-                                     -4.955827057601261),
-                                    ("weekyear", -5.3612921657094255),
-                                    ("\1052\1072\1081year", -5.3612921657094255),
-                                    ("last <cycle> of <time>year", -5.3612921657094255),
+                                     -4.927253685157205),
+                                    ("\1052\1072\1081year", -5.332718793265369),
+                                    ("on <date>\1052\1072\1088\1090", -5.332718793265369),
                                     ("\1089\1077\1075\1086\1076\1085\1103<time-of-day>  o'clock",
-                                     -4.955827057601261),
+                                     -4.927253685157205),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.2626798770413155),
-                                    ("\1052\1072\1088\1090year", -4.66814498514948)],
-                               n = 168},
+                                     -4.23410650459726),
+                                    ("\1052\1072\1088\1090year", -4.416428061391214)],
+                               n = 164},
                    koData =
-                     ClassData{prior = -1.7578579175523736, unseen = -5.081404364984463,
+                     ClassData{prior = -1.8666607774011728, unseen = -4.990432586778736,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -4.382026634673881),
-                                    ("daymonth", -2.772588722239781),
-                                    ("monthyear", -3.283414346005772),
-                                    ("yearhour", -4.382026634673881),
-                                    ("intersect<time-of-day>  o'clock", -4.382026634673881),
-                                    ("intersect<time> <part-of-day>", -4.382026634673881),
+                                   [("dayhour", -4.290459441148391),
+                                    ("daymonth", -2.7863820443721172),
+                                    ("monthyear", -3.1918471524802814),
+                                    ("yearhour", -4.290459441148391),
+                                    ("intersect<time-of-day>  o'clock", -4.290459441148391),
+                                    ("intersect<time> <part-of-day>", -4.290459441148391),
                                     ("<day-of-month> (ordinal)\1060\1077\1074\1088\1072\1083\1100",
-                                     -3.6888794541139363),
+                                     -3.3741687092742363),
                                     ("<day-of-month> (ordinal)\1054\1082\1090\1103\1073\1088\1100",
-                                     -4.382026634673881),
-                                    ("monthhour", -3.6888794541139363),
-                                    ("hourmonth", -4.382026634673881),
-                                    ("<day-of-month> (ordinal)\1042\1090\1086\1088\1085\1080\1082",
-                                     -4.382026634673881),
-                                    ("dayday", -3.6888794541139363),
-                                    ("<day-of-month> (ordinal)intersect", -3.6888794541139363),
-                                    ("dayyear", -2.6772785424354564),
+                                     -4.290459441148391),
+                                    ("monthhour", -3.597312260588446),
+                                    ("hourmonth", -4.290459441148391),
+                                    ("<day-of-month> (ordinal)intersect", -3.884994333040227),
+                                    ("dayyear", -2.681021528714291),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -3.9765615265657175),
-                                    ("\1048\1102\1083\1100year", -3.9765615265657175),
+                                     -3.884994333040227),
+                                    ("\1048\1102\1083\1100year", -3.884994333040227),
                                     ("between <time-of-day> and <time-of-day> (interval)\1048\1102\1083\1100",
-                                     -4.382026634673881),
-                                    ("\1057\1088\1077\1076\1072intersect", -4.382026634673881),
-                                    ("<day-of-month> (ordinal)\1057\1088\1077\1076\1072",
-                                     -4.382026634673881),
-                                    ("\1048\1102\1083\1100intersect", -4.382026634673881),
-                                    ("<day-of-month> (ordinal)\1052\1072\1081", -4.382026634673881),
+                                     -4.290459441148391),
+                                    ("\1048\1102\1083\1100intersect", -4.290459441148391),
+                                    ("<day-of-month> (ordinal)\1052\1072\1081", -4.290459441148391),
                                     ("\1089\1077\1075\1086\1076\1085\1103at <time-of-day>",
-                                     -4.382026634673881),
-                                    ("dayminute", -3.9765615265657175),
+                                     -4.290459441148391),
+                                    ("dayminute", -3.884994333040227),
                                     ("\1063\1077\1090\1074\1077\1088\1075hh:mm",
-                                     -3.9765615265657175),
-                                    ("intersectyear", -3.6888794541139363),
-                                    ("\1040\1087\1088\1077\1083\1100year", -4.382026634673881),
-                                    ("intersect\1054\1082\1090\1103\1073\1088\1100",
-                                     -4.382026634673881),
-                                    ("year<time> <part-of-day>", -4.382026634673881),
-                                    ("mm/ddyear", -3.283414346005772),
-                                    ("\1052\1072\1088\1090year", -3.9765615265657175)],
-                               n = 35}}),
+                                     -3.884994333040227),
+                                    ("intersectyear", -3.884994333040227),
+                                    ("\1040\1087\1088\1077\1083\1100year", -4.290459441148391),
+                                    ("year<time> <part-of-day>", -4.290459441148391),
+                                    ("mm/ddyear", -3.1918471524802814),
+                                    ("\1052\1072\1088\1090year", -3.884994333040227)],
+                               n = 30}}),
        ("\1040\1087\1088\1077\1083\1100",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -520,26 +517,26 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097,
-                               unseen = -2.3025850929940455,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                     ClassData{prior = -0.10536051565782628,
+                               unseen = -2.3978952727983707,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+                     ClassData{prior = -2.3025850929940455,
+                               unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("next <cycle>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.2188758248682006,
+                     ClassData{prior = 0.0, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.791759469228055),
-                                    ("month (grain)", -2.4849066497880004),
-                                    ("year (grain)", -2.0794415416798357),
-                                    ("week (grain)", -1.791759469228055),
-                                    ("quarter", -2.0794415416798357), ("year", -2.0794415416798357),
-                                    ("month", -2.4849066497880004),
-                                    ("quarter (grain)", -2.0794415416798357)],
-                               n = 8},
+                                   [("week", -1.8718021769015913),
+                                    ("month (grain)", -2.159484249353372),
+                                    ("year (grain)", -2.159484249353372),
+                                    ("week (grain)", -1.8718021769015913),
+                                    ("quarter", -2.159484249353372), ("year", -2.159484249353372),
+                                    ("month", -2.159484249353372),
+                                    ("quarter (grain)", -2.159484249353372)],
+                               n = 9},
                    koData =
                      ClassData{prior = -infinity, unseen = -2.1972245773362196,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -575,24 +572,24 @@ classifiers
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarteryear", -0.6931471805599453),
-                                    ("ordinals (first..19th)quarter (grain)year",
-                                     -0.6931471805599453)],
+                                   [("ordinals (first..20th, then 30th, 40th, ..., 100th)quarter (grain)year",
+                                     -0.6931471805599453),
+                                    ("quarteryear", -0.6931471805599453)],
                                n = 2},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1054\1082\1090\1103\1073\1088\1100",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     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}}),
        ("ordinal 21..99",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -612,44 +609,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = -0.5596157879354228, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("daymonth", -1.6094379124341003),
-                                    ("dayyear", -1.6094379124341003),
-                                    ("ordinals (first..19th)\1057\1088\1077\1076\1072intersect",
-                                     -1.6094379124341003),
-                                    ("ordinals (first..19th)intersectyear", -1.6094379124341003)],
-                               n = 4},
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = -0.8472978603872037, unseen = -2.639057329615259,
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.466337068793427),
-                                    ("monthyear", -1.8718021769015913),
-                                    ("ordinals (first..19th)\1057\1088\1077\1076\1072\1054\1082\1090\1103\1073\1088\1100",
-                                     -1.466337068793427),
-                                    ("ordinals (first..19th)\1052\1072\1081year",
-                                     -1.8718021769015913)],
-                               n = 3}}),
+                                   [("monthyear", -0.6931471805599453),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1052\1072\1081year",
+                                     -0.6931471805599453)],
+                               n = 1}}),
+       ("ordinals (first..20th, then 30th, 40th, ..., 100th)",
+        Classifier{okData =
+                     ClassData{prior = -0.35667494393873245,
+                               unseen = -2.772588722239781,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 14},
+                   koData =
+                     ClassData{prior = -1.2039728043259361,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6}}),
        ("\1042\1086\1089\1082\1088\1077\1089\1077\1085\1100\1077",
         Classifier{okData =
-                     ClassData{prior = -0.6931471805599453,
-                               unseen = -1.0986122886681098,
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1},
                    koData =
-                     ClassData{prior = -0.6931471805599453,
-                               unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("week (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.12516314295400605,
-                               unseen = -2.833213344056216,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 15},
+                     ClassData{prior = -6.899287148695143e-2,
+                               unseen = -2.772588722239781,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 14},
                    koData =
-                     ClassData{prior = -2.1400661634962708,
-                               unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+                     ClassData{prior = -2.70805020110221, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<part-of-day> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -667,41 +660,41 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month>(ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -0.19671029424605427, unseen = -4.0943445622221,
+                     ClassData{prior = -0.2076393647782445, unseen = -4.189654742026425,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..19th)\1060\1077\1074\1088\1072\1083\1100",
-                                     -2.691243082785829),
-                                    ("ordinals (first..19th)\1040\1087\1088\1077\1083\1100",
-                                     -3.3843902633457743),
+                                   [("ordinals (first..20th, then 30th, 40th, ..., 100th)\1040\1074\1075\1091\1089\1090",
+                                     -3.481240089335692),
                                     ("ordinal 21..99\1054\1082\1090\1103\1073\1088\1100",
-                                     -3.3843902633457743),
-                                    ("ordinal (digits)\1052\1072\1088\1090", -2.9789251552376097),
-                                    ("ordinals (first..19th)\1040\1074\1075\1091\1089\1090",
-                                     -3.3843902633457743),
-                                    ("ordinals (first..19th)\1052\1072\1088\1090",
-                                     -2.691243082785829),
+                                     -3.481240089335692),
+                                    ("ordinal (digits)\1052\1072\1088\1090", -3.0757749812275272),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1060\1077\1074\1088\1072\1083\1100",
+                                     -2.5649493574615367),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1052\1072\1088\1090",
+                                     -2.5649493574615367),
                                     ("ordinal 21..99\1060\1077\1074\1088\1072\1083\1100",
-                                     -2.691243082785829),
-                                    ("month", -0.8994836135577737),
+                                     -2.5649493574615367),
+                                    ("month", -0.878550403891308),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1040\1087\1088\1077\1083\1100",
+                                     -3.481240089335692),
                                     ("ordinal (digits)\1054\1082\1090\1103\1073\1088\1100",
-                                     -3.3843902633457743),
+                                     -3.481240089335692),
                                     ("ordinal (digits)\1060\1077\1074\1088\1072\1083\1100",
-                                     -1.9980959022258835),
-                                    ("ordinal 21..99\1052\1072\1081", -3.3843902633457743)],
-                               n = 23},
+                                     -2.094945728215801),
+                                    ("ordinal 21..99\1052\1072\1081", -3.481240089335692)],
+                               n = 26},
                    koData =
-                     ClassData{prior = -1.7227665977411035,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = -1.6739764335716716, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..19th)\1060\1077\1074\1088\1072\1083\1100",
-                                     -1.749199854809259),
-                                    ("ordinals (first..19th)\1054\1082\1090\1103\1073\1088\1100",
-                                     -2.4423470353692043),
-                                    ("month", -1.3437347467010947),
-                                    ("ordinals (first..19th)\1052\1072\1081", -2.4423470353692043)],
-                               n = 5}}),
+                                   [("ordinals (first..20th, then 30th, 40th, ..., 100th)\1052\1072\1081",
+                                     -2.5257286443082556),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1060\1077\1074\1088\1072\1083\1100",
+                                     -1.6094379124341003),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1054\1082\1090\1103\1073\1088\1100",
+                                     -2.5257286443082556),
+                                    ("month", -1.2729656758128873)],
+                               n = 6}}),
        ("\1048\1102\1083\1100",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -725,8 +718,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1057\1077\1085\1090\1103\1073\1088\1100",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = 0.0, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 1},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -739,20 +732,33 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("afternoon",
         Classifier{okData =
-                     ClassData{prior = -0.587786664902119, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = -0.45198512374305727,
+                               unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
                    koData =
-                     ClassData{prior = -0.8109302162163288, unseen = -1.791759469228055,
+                     ClassData{prior = -1.0116009116784799, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+       ("this <cycle>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("month (grain)", -1.791759469228055),
+                                    ("year (grain)", -1.791759469228055),
+                                    ("quarter", -1.791759469228055), ("year", -1.791759469228055),
+                                    ("month", -1.791759469228055),
+                                    ("quarter (grain)", -1.791759469228055)],
+                               n = 3},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("minute (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("night",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -769,15 +775,14 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.42608439531090014,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -0.4372138064227446, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.1823215567939546),
-                                    ("integer (3..19)", -2.1972245773362196)],
-                               n = 32},
+                                   [("integer (numeric)", -0.1880522315029396),
+                                    ("integer (3..19)", -2.169053700369523)],
+                               n = 31},
                    koData =
-                     ClassData{prior = -1.0586069540544105,
+                     ClassData{prior = -1.0379876668516748,
                                unseen = -3.0910424533583156,
                                likelihoods =
                                  HashMap.fromList
@@ -795,18 +800,17 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.3101549283038396,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -3.0910424533583156,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 22},
+                               n = 20},
                    koData =
-                     ClassData{prior = -1.3217558399823195,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -1.791759469228055, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 8}}),
+                               n = 4}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -1.252762968495368, unseen = -4.304065093204169,
+                     ClassData{prior = -1.213022639845854, unseen = -4.304065093204169,
                                likelihoods =
                                  HashMap.fromList
                                    [("week", -2.498699971920336),
@@ -828,43 +832,35 @@ classifiers
                                     ("integer 2year (grain)", -3.597312260588446)],
                                n = 22},
                    koData =
-                     ClassData{prior = -0.3364722366212129, unseen = -4.941642422609305,
+                     ClassData{prior = -0.3528213746227423, unseen = -4.897839799950911,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.3250360206965914),
-                                    ("integer 2week (grain)", -4.241326752570746),
-                                    ("integer (numeric)day (grain)", -3.548179572010801),
-                                    ("integer (3..19)day (grain)", -4.241326752570746),
-                                    ("integer 2minute (grain)", -4.241326752570746),
-                                    ("second", -3.3250360206965914),
-                                    ("integer 2month (grain)", -4.241326752570746),
-                                    ("integer (3..19)second (grain) ", -4.241326752570746),
-                                    ("integer (numeric)second (grain) ", -3.835861644462582),
-                                    ("integer (numeric)year (grain)", -3.835861644462582),
-                                    ("integer (3..19)year (grain)", -4.241326752570746),
-                                    ("day", -3.1427144639026365), ("year", -3.3250360206965914),
-                                    ("integer (3..19)week (grain)", -4.241326752570746),
-                                    ("integer 2day (grain)", -4.241326752570746),
-                                    ("integer (numeric)week (grain)", -3.835861644462582),
-                                    ("integer (3..19)minute (grain)", -4.241326752570746),
-                                    ("hour", -1.602269422955488), ("month", -3.3250360206965914),
-                                    ("integer (numeric)minute (grain)", -3.1427144639026365),
-                                    ("integer 2second (grain) ", -4.241326752570746),
-                                    ("integer (3..19)month (grain)", -4.241326752570746),
-                                    ("integer (numeric)month (grain)", -3.835861644462582),
-                                    ("integer (3..19)hour (grain)", -3.835861644462582),
-                                    ("minute", -2.8550323914508557),
-                                    ("integer (numeric)hour (grain)", -1.6763773951092098),
-                                    ("integer 2year (grain)", -4.241326752570746)],
-                               n = 55}}),
-       ("ordinals (first..19th)",
-        Classifier{okData =
-                     ClassData{prior = -0.5389965007326869, unseen = -2.772588722239781,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 14},
-                   koData =
-                     ClassData{prior = -0.8754687373538999,
-                               unseen = -2.4849066497880004,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 10}}),
+                                   [("week", -3.2809112157876537),
+                                    ("integer 2week (grain)", -4.197201947661808),
+                                    ("integer (numeric)day (grain)", -3.5040547671018634),
+                                    ("integer (3..19)day (grain)", -4.197201947661808),
+                                    ("integer 2minute (grain)", -4.197201947661808),
+                                    ("second", -3.2809112157876537),
+                                    ("integer 2month (grain)", -4.197201947661808),
+                                    ("integer (3..19)second (grain) ", -4.197201947661808),
+                                    ("integer (numeric)second (grain) ", -3.791736839553644),
+                                    ("integer (numeric)year (grain)", -3.791736839553644),
+                                    ("integer (3..19)year (grain)", -4.197201947661808),
+                                    ("day", -3.0985896589936988), ("year", -3.2809112157876537),
+                                    ("integer (3..19)week (grain)", -4.197201947661808),
+                                    ("integer 2day (grain)", -4.197201947661808),
+                                    ("integer (numeric)week (grain)", -3.791736839553644),
+                                    ("integer (3..19)minute (grain)", -4.197201947661808),
+                                    ("hour", -1.55814461804655), ("month", -3.2809112157876537),
+                                    ("integer (numeric)minute (grain)", -3.791736839553644),
+                                    ("integer 2second (grain) ", -4.197201947661808),
+                                    ("integer (3..19)month (grain)", -4.197201947661808),
+                                    ("integer (numeric)month (grain)", -3.791736839553644),
+                                    ("integer (3..19)hour (grain)", -3.791736839553644),
+                                    ("minute", -3.2809112157876537),
+                                    ("integer (numeric)hour (grain)", -1.6322525902002718),
+                                    ("integer 2year (grain)", -4.197201947661808)],
+                               n = 52}}),
        ("\1057\1091\1073\1073\1086\1090\1072",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -874,7 +870,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("a <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -3.109060958860994, unseen = -3.295836866004329,
+                     ClassData{prior = -3.054001181677967, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
                                    [("week", -1.8718021769015913),
@@ -885,25 +881,25 @@ classifiers
                                     ("hour", -2.5649493574615367)],
                                n = 5},
                    koData =
-                     ClassData{prior = -4.567003683318832e-2,
-                               unseen = -5.442417710521793,
+                     ClassData{prior = -4.831857727080768e-2,
+                               unseen = -5.389071729816501,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.7300291078209855),
-                                    ("month (grain)", -2.873129951461659),
-                                    ("hour (grain)", -1.911718784307034),
-                                    ("year (grain)", -3.040184036124825),
-                                    ("second", -3.6463198396951406),
-                                    ("week (grain)", -2.7300291078209855),
-                                    ("day", -2.7300291078209855), ("quarter", -3.3586377672433594),
-                                    ("minute (grain)", -2.873129951461659),
-                                    ("year", -3.040184036124825),
-                                    ("second (grain) ", -3.6463198396951406),
-                                    ("hour", -1.911718784307034), ("month", -2.873129951461659),
-                                    ("quarter (grain)", -3.3586377672433594),
-                                    ("minute", -2.873129951461659),
-                                    ("day (grain)", -2.7300291078209855)],
-                               n = 107}}),
+                                   [("week", -2.819545705327552),
+                                    ("month (grain)", -2.7454377331738304),
+                                    ("hour (grain)", -1.8581345381729275),
+                                    ("year (grain)", -2.9865997899907186),
+                                    ("second", -3.592735593561034),
+                                    ("week (grain)", -2.819545705327552),
+                                    ("day", -2.819545705327552), ("quarter", -3.305053521109253),
+                                    ("minute (grain)", -3.0819099697950434),
+                                    ("year", -2.9865997899907186),
+                                    ("second (grain) ", -3.592735593561034),
+                                    ("hour", -1.8581345381729275), ("month", -2.7454377331738304),
+                                    ("quarter (grain)", -3.305053521109253),
+                                    ("minute", -3.0819099697950434),
+                                    ("day (grain)", -2.819545705327552)],
+                               n = 101}}),
        ("dd.(mm.)? - dd.mm.(yy[yy]?)? (interval)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -913,12 +909,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh:mm",
         Classifier{okData =
-                     ClassData{prior = -4.8790164169432056e-2,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = 0.0, unseen = -3.0910424533583156,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 20},
                    koData =
-                     ClassData{prior = -3.044522437723423, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by ','",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -4.02535169073515,
@@ -966,13 +961,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1042\1090\1086\1088\1085\1080\1082",
         Classifier{okData =
-                     ClassData{prior = -0.15415067982725836,
-                               unseen = -2.0794415416798357,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
-                     ClassData{prior = -1.9459101490553135,
-                               unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("\1055\1103\1090\1085\1080\1094\1072",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1013,20 +1006,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.44468582126144557,
-                               unseen = -3.367295829986474,
+                     ClassData{prior = -0.325422400434628, unseen = -3.4011973816621555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal 21..99", -1.540445040947149),
-                                    ("ordinals (first..19th)", -0.9343092373768334),
-                                    ("ordinal (digits)", -0.9343092373768334)],
-                               n = 25},
+                                   [("ordinal 21..99", -1.4213856809311607),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)",
+                                     -0.9694005571881036),
+                                    ("ordinal (digits)", -0.9694005571881036)],
+                               n = 26},
                    koData =
-                     ClassData{prior = -1.024504316514388, unseen = -2.890371757896165,
+                     ClassData{prior = -1.2809338454620642, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..19th)", -0.12516314295400605)],
-                               n = 14}}),
+                                   [("ordinals (first..20th, then 30th, 40th, ..., 100th)",
+                                     -0.1670540846631662)],
+                               n = 10}}),
        ("noon",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -1052,8 +1046,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1060\1077\1074\1088\1072\1083\1100",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.0910424533583156,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 20},
+                     ClassData{prior = 0.0, unseen = -3.1780538303479458,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 22},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1238,23 +1232,18 @@ classifiers
                                n = 2}}),
        ("this|next <day-of-week>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.1972245773362196,
+                     ClassData{prior = 0.0, unseen = -2.70805020110221,
                                likelihoods =
                                  HashMap.fromList
                                    [("\1055\1086\1085\1077\1076\1077\1083\1100\1085\1080\1082",
-                                     -1.3862943611198906),
-                                    ("day", -0.9808292530117262),
-                                    ("\1042\1090\1086\1088\1085\1080\1082", -1.3862943611198906)],
-                               n = 2},
+                                     -1.9459101490553135),
+                                    ("\1057\1088\1077\1076\1072", -1.252762968495368),
+                                    ("day", -0.8472978603872037),
+                                    ("\1042\1090\1086\1088\1085\1080\1082", -1.9459101490553135)],
+                               n = 5},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("\1057\1088\1077\1076\1072", -1.0986122886681098),
-                                    ("day", -1.0986122886681098)],
-                               n = 1}}),
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("ordinal (digits)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
@@ -1264,58 +1253,44 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.3364722366212129,
-                               unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
-                   koData =
-                     ClassData{prior = -1.252762968495368, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
-       ("last <cycle> of <time>",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("weekmonth", -0.8472978603872037),
-                                    ("week (grain)\1057\1077\1085\1090\1103\1073\1088\1100",
-                                     -1.252762968495368),
-                                    ("week (grain)intersect", -1.252762968495368)],
-                               n = 2},
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\1052\1072\1088\1090",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 10},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month>(ordinal) <named-month> year",
         Classifier{okData =
-                     ClassData{prior = -0.25131442828090605,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = -0.2231435513142097, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..19th)\1040\1087\1088\1077\1083\1100",
-                                     -2.4423470353692043),
-                                    ("ordinal 21..99\1054\1082\1090\1103\1073\1088\1100",
-                                     -2.4423470353692043),
-                                    ("ordinal (digits)\1052\1072\1088\1090", -2.4423470353692043),
-                                    ("ordinals (first..19th)\1052\1072\1088\1090",
-                                     -2.03688192726104),
-                                    ("month", -1.0560526742493137),
+                                   [("ordinal 21..99\1054\1082\1090\1103\1073\1088\1100",
+                                     -2.5257286443082556),
+                                    ("ordinal (digits)\1052\1072\1088\1090", -2.5257286443082556),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1052\1072\1088\1090",
+                                     -1.8325814637483102),
+                                    ("month", -1.0216512475319814),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1040\1087\1088\1077\1083\1100",
+                                     -2.5257286443082556),
                                     ("ordinal (digits)\1054\1082\1090\1103\1073\1088\1100",
-                                     -2.4423470353692043),
-                                    ("ordinal 21..99\1052\1072\1081", -2.4423470353692043)],
-                               n = 7},
+                                     -2.5257286443082556),
+                                    ("ordinal 21..99\1052\1072\1081", -2.5257286443082556)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -1.5040773967762742, unseen = -2.639057329615259,
+                     ClassData{prior = -1.6094379124341003, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (first..19th)\1054\1082\1090\1103\1073\1088\1100",
+                                   [("ordinals (first..20th, then 30th, 40th, ..., 100th)\1052\1072\1081",
+                                     -1.8718021769015913),
+                                    ("ordinals (first..20th, then 30th, 40th, ..., 100th)\1054\1082\1090\1103\1073\1088\1100",
                                      -1.8718021769015913),
-                                    ("month", -1.466337068793427),
-                                    ("ordinals (first..19th)\1052\1072\1081", -1.8718021769015913)],
+                                    ("month", -1.466337068793427)],
                                n = 2}}),
        ("\1056\1086\1078\1076\1077\1089\1090\1074\1086 \1061\1088\1080\1089\1090\1086\1074\1086",
         Classifier{okData =
@@ -1326,13 +1301,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("morning",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -1.6094379124341003,
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("week-end",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -1354,13 +1327,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("day (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.5596157879354228,
+                     ClassData{prior = -0.40546510810816444,
                                unseen = -2.3025850929940455,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
-                     ClassData{prior = -0.8472978603872037,
-                               unseen = -2.0794415416798357,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 6}}),
+                     ClassData{prior = -1.0986122886681098, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("\1052\1072\1081",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -1379,30 +1351,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("composite <duration>",
-        Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0},
-                   koData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("hourminute", -0.6931471805599453),
-                                    ("integer (numeric)hour (grain)<integer> <unit-of-duration>",
-                                     -0.6931471805599453)],
-                               n = 1}}),
-       ("<hour-of-day> <integer> (as relative minutes)",
-        Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("hour", -0.6931471805599453),
-                                    ("<time-of-day>  o'clockinteger (numeric)",
-                                     -0.6931471805599453)],
-                               n = 1},
-                   koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
diff --git a/Duckling/Ranking/Classifiers/TR_XX.hs b/Duckling/Ranking/Classifiers/TR_XX.hs
index 433cf07e4..47eac2151 100644
--- a/Duckling/Ranking/Classifiers/TR_XX.hs
+++ b/Duckling/Ranking/Classifiers/TR_XX.hs
@@ -381,11 +381,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("hafta (grain)",
         Classifier{okData =
-                     ClassData{prior = -8.004270767353637e-2,
-                               unseen = -3.258096538021482,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 24},
+                     ClassData{prior = -7.696104113612832e-2,
+                               unseen = -3.295836866004329,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 25},
                    koData =
-                     ClassData{prior = -2.5649493574615367,
+                     ClassData{prior = -2.6026896854443837,
                                unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("Pazartesi",
@@ -576,16 +576,17 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<duration> from now",
         Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
+                     ClassData{prior = -infinity, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -2.70805020110221,
+                     ClassData{prior = 0.0, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("second", -1.540445040947149), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -0.8472978603872037),
-                                    ("hour", -1.540445040947149)],
-                               n = 5}}),
+                                   [("week", -2.1400661634962708), ("second", -1.7346010553881064),
+                                    ("year", -2.1400661634962708),
+                                    ("<integer> <unit-of-duration>", -0.8873031950009028),
+                                    ("hour", -1.7346010553881064)],
+                               n = 6}}),
        ("quarter",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -653,8 +654,7 @@ classifiers
                                n = 2}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.43995128417933377,
-                               unseen = -4.584967478670572,
+                     ClassData{prior = -0.456758402495715, unseen = -4.584967478670572,
                                likelihoods =
                                  HashMap.fromList
                                    [("week", -2.0898043287153825),
@@ -677,30 +677,29 @@ classifiers
                                     ("integer (0..9)dakika (grain)", -3.4760986898352733)],
                                n = 38},
                    koData =
-                     ClassData{prior = -1.0330150061822965,
-                               unseen = -4.1588830833596715,
+                     ClassData{prior = -1.0033021088637848, unseen = -4.189654742026425,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.7568403652716422),
-                                    ("integer (numeric)saniye (grain)", -3.044522437723423),
-                                    ("integer (0..9)saniye (grain)", -3.044522437723423),
-                                    ("second", -2.5336968139574325),
-                                    ("integer (numeric)g\252n (grain)", -3.4499875458315876),
-                                    ("integer (numeric)ay (grain)", -3.4499875458315876),
-                                    ("integer (0..9)g\252n (grain)", -3.4499875458315876),
-                                    ("integer (numeric)y\305l (grain)", -3.044522437723423),
-                                    ("day", -3.044522437723423),
-                                    ("integer (0..9)ay (grain)", -3.4499875458315876),
-                                    ("year", -2.5336968139574325),
-                                    ("integer (0..9)y\305l (grain)", -3.044522437723423),
-                                    ("hour", -2.5336968139574325), ("month", -3.044522437723423),
-                                    ("integer (numeric)dakika (grain)", -3.4499875458315876),
-                                    ("integer (0..9)saat (grain)", -3.044522437723423),
-                                    ("integer (0..9)hafta (grain)", -2.7568403652716422),
-                                    ("minute", -3.044522437723423),
-                                    ("integer (numeric)saat (grain)", -3.044522437723423),
-                                    ("integer (0..9)dakika (grain)", -3.4499875458315876)],
-                               n = 21}}),
+                                   [("week", -2.5649493574615367),
+                                    ("integer (numeric)saniye (grain)", -3.0757749812275272),
+                                    ("integer (0..9)saniye (grain)", -3.0757749812275272),
+                                    ("second", -2.5649493574615367),
+                                    ("integer (numeric)g\252n (grain)", -3.481240089335692),
+                                    ("integer (numeric)ay (grain)", -3.481240089335692),
+                                    ("integer (0..9)g\252n (grain)", -3.481240089335692),
+                                    ("integer (numeric)y\305l (grain)", -3.0757749812275272),
+                                    ("day", -3.0757749812275272),
+                                    ("integer (0..9)ay (grain)", -3.481240089335692),
+                                    ("year", -2.5649493574615367),
+                                    ("integer (0..9)y\305l (grain)", -3.0757749812275272),
+                                    ("hour", -2.5649493574615367), ("month", -3.0757749812275272),
+                                    ("integer (numeric)dakika (grain)", -3.481240089335692),
+                                    ("integer (0..9)saat (grain)", -3.0757749812275272),
+                                    ("integer (0..9)hafta (grain)", -2.5649493574615367),
+                                    ("minute", -3.0757749812275272),
+                                    ("integer (numeric)saat (grain)", -3.0757749812275272),
+                                    ("integer (0..9)dakika (grain)", -3.481240089335692)],
+                               n = 22}}),
        ("Aral\305k",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -941,21 +940,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("next n <cycle>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.258096538021482,
+                     ClassData{prior = 0.0, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (numeric)saniye (grain)", -2.5257286443082556),
-                                    ("integer (0..9)saniye (grain)", -2.5257286443082556),
-                                    ("second", -2.120263536200091),
-                                    ("integer (numeric)y\305l (grain)", -2.5257286443082556),
-                                    ("year", -2.120263536200091),
-                                    ("integer (0..9)y\305l (grain)", -2.5257286443082556),
-                                    ("hour", -2.120263536200091),
-                                    ("integer (0..9)saat (grain)", -2.5257286443082556),
-                                    ("integer (0..9)hafta (grain)", -2.5257286443082556),
-                                    ("integer (numeric)saat (grain)", -2.5257286443082556)],
-                               n = 7},
+                                   [("week", -2.1972245773362196),
+                                    ("integer (numeric)saniye (grain)", -2.6026896854443837),
+                                    ("integer (0..9)saniye (grain)", -2.6026896854443837),
+                                    ("second", -2.1972245773362196),
+                                    ("integer (numeric)y\305l (grain)", -2.6026896854443837),
+                                    ("year", -2.1972245773362196),
+                                    ("integer (0..9)y\305l (grain)", -2.6026896854443837),
+                                    ("hour", -2.1972245773362196),
+                                    ("integer (0..9)saat (grain)", -2.6026896854443837),
+                                    ("integer (0..9)hafta (grain)", -2.1972245773362196),
+                                    ("integer (numeric)saat (grain)", -2.6026896854443837)],
+                               n = 8},
                    koData =
                      ClassData{prior = -infinity, unseen = -2.4849066497880004,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1133,8 +1132,8 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 65}}),
        ("integer (0..9)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.6109179126442243,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 35},
+                     ClassData{prior = 0.0, unseen = -3.6375861597263857,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 36},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
diff --git a/Duckling/Time/AR/Rules.hs b/Duckling/Time/AR/Rules.hs
index c5bb0c94a..58946fa31 100644
--- a/Duckling/Time/AR/Rules.hs
+++ b/Duckling/Time/AR/Rules.hs
@@ -356,8 +356,7 @@ ruleYearPastLatent :: Rule
 ruleYearPastLatent = Rule
  { name = "past year (latent)"
  , pattern =
-   [ Predicate $
-       or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+   [ Predicate $ isIntegerBetween 25 999
    ]
  , prod = \tokens -> case tokens of
      (token:_) -> do
diff --git a/Duckling/Time/BG/Rules.hs b/Duckling/Time/BG/Rules.hs
index cb98bed97..270b23286 100644
--- a/Duckling/Time/BG/Rules.hs
+++ b/Duckling/Time/BG/Rules.hs
@@ -324,8 +324,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       ]
   , prod = \case
       (token:_) -> do
@@ -338,7 +337,7 @@ ruleYearADBC :: Rule
 ruleYearADBC = Rule
   { name = "<year> (bc|ad)"
   , pattern =
-    [ Predicate $ isIntegerBetween (-10000) 10000
+    [ Predicate $ isIntegerBetween 1 10000
     , regex "(пр|сл)\\.?\\s+(Хр\\.?|н\\.?\\e.?)"
     ]
   , prod = \case
diff --git a/Duckling/Time/CA/Rules.hs b/Duckling/Time/CA/Rules.hs
index 2b570dda0..95c8146d1 100644
--- a/Duckling/Time/CA/Rules.hs
+++ b/Duckling/Time/CA/Rules.hs
@@ -1105,7 +1105,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $ or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       ]
   , prod = \case
       (t:_) -> do
diff --git a/Duckling/Time/DA/Rules.hs b/Duckling/Time/DA/Rules.hs
index fd5d0c982..86fcc8a26 100644
--- a/Duckling/Time/DA/Rules.hs
+++ b/Duckling/Time/DA/Rules.hs
@@ -1300,7 +1300,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/DE/Rules.hs b/Duckling/Time/DE/Rules.hs
index 7d736fbd7..7826d8bba 100644
--- a/Duckling/Time/DE/Rules.hs
+++ b/Duckling/Time/DE/Rules.hs
@@ -1440,8 +1440,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/EL/Rules.hs b/Duckling/Time/EL/Rules.hs
index e877719cd..361498cd8 100644
--- a/Duckling/Time/EL/Rules.hs
+++ b/Duckling/Time/EL/Rules.hs
@@ -1161,8 +1161,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/EN/Rules.hs b/Duckling/Time/EN/Rules.hs
index 3464d9b26..ee0054966 100644
--- a/Duckling/Time/EN/Rules.hs
+++ b/Duckling/Time/EN/Rules.hs
@@ -386,8 +386,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       ]
   , prod = \case
       (token:_) -> do
@@ -400,7 +399,7 @@ ruleYearADBC :: Rule
 ruleYearADBC = Rule
   { name = "<year> (bc|ad)"
   , pattern =
-    [ Predicate $ isIntegerBetween (-10000) 10000
+    [ Predicate $ isIntegerBetween 1 10000
     , regex "(a\\.?d\\.?|b\\.?c\\.?)"
     ]
   , prod = \case
diff --git a/Duckling/Time/ES/Rules.hs b/Duckling/Time/ES/Rules.hs
index 54783b0a2..8e147cc10 100644
--- a/Duckling/Time/ES/Rules.hs
+++ b/Duckling/Time/ES/Rules.hs
@@ -994,8 +994,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/FR/Rules.hs b/Duckling/Time/FR/Rules.hs
index ba67f741d..2a6507c00 100644
--- a/Duckling/Time/FR/Rules.hs
+++ b/Duckling/Time/FR/Rules.hs
@@ -1498,7 +1498,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/GA/Rules.hs b/Duckling/Time/GA/Rules.hs
index 5515b7414..2ed2df2af 100644
--- a/Duckling/Time/GA/Rules.hs
+++ b/Duckling/Time/GA/Rules.hs
@@ -440,7 +440,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/HR/Rules.hs b/Duckling/Time/HR/Rules.hs
index e2bb7384e..eaa983a42 100644
--- a/Duckling/Time/HR/Rules.hs
+++ b/Duckling/Time/HR/Rules.hs
@@ -1134,8 +1134,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-       or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
      (token:_) -> do
diff --git a/Duckling/Time/IT/Rules.hs b/Duckling/Time/IT/Rules.hs
index 81f739db1..e086a0aea 100644
--- a/Duckling/Time/IT/Rules.hs
+++ b/Duckling/Time/IT/Rules.hs
@@ -1060,8 +1060,8 @@ ruleSeason4 = Rule
       in Token Time <$> interval TTime.Open from to
   }
 
-ruleYearLatent2 :: Rule
-ruleYearLatent2 = Rule
+ruleYearLatent :: Rule
+ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
     [ Predicate $ isIntegerBetween 2101 10000
@@ -2062,19 +2062,6 @@ ruleTimeofdayCirca = Rule
       _ -> Nothing
   }
 
-ruleYearLatent :: Rule
-ruleYearLatent = Rule
-  { name = "year (latent)"
-  , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) (-1)
-    ]
-  , prod = \tokens -> case tokens of
-      (token:_) -> do
-        n <- getIntValue token
-        tt . mkLatent $ year n
-      _ -> Nothing
-  }
-
 ruleYesterday :: Rule
 ruleYesterday = Rule
   { name = "yesterday"
@@ -2533,7 +2520,6 @@ rules =
   , ruleValentinesDay
   , ruleWeekend
   , ruleYearLatent
-  , ruleYearLatent2
   , ruleYearNotLatent
   , ruleYesterday
   , ruleYyyymmdd
diff --git a/Duckling/Time/JA/Rules.hs b/Duckling/Time/JA/Rules.hs
index 519983845..110bcd6e9 100644
--- a/Duckling/Time/JA/Rules.hs
+++ b/Duckling/Time/JA/Rules.hs
@@ -291,7 +291,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-      [ Predicate $ or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 10000]
+      [ Predicate $ isIntegerBetween 25 10000
       , regex "年"
       ]
   , prod = \tokens -> case tokens of
diff --git a/Duckling/Time/KO/Rules.hs b/Duckling/Time/KO/Rules.hs
index 9ff9d441b..ad59e66c3 100644
--- a/Duckling/Time/KO/Rules.hs
+++ b/Duckling/Time/KO/Rules.hs
@@ -841,7 +841,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/NB/Rules.hs b/Duckling/Time/NB/Rules.hs
index 6f7f4fb92..001110ace 100644
--- a/Duckling/Time/NB/Rules.hs
+++ b/Duckling/Time/NB/Rules.hs
@@ -1260,8 +1260,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-       or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/NL/Rules.hs b/Duckling/Time/NL/Rules.hs
index 8e938b257..5641f2ceb 100644
--- a/Duckling/Time/NL/Rules.hs
+++ b/Duckling/Time/NL/Rules.hs
@@ -1109,8 +1109,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/PL/Rules.hs b/Duckling/Time/PL/Rules.hs
index 307e8a00e..821fad4ef 100644
--- a/Duckling/Time/PL/Rules.hs
+++ b/Duckling/Time/PL/Rules.hs
@@ -1138,7 +1138,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/PT/Rules.hs b/Duckling/Time/PT/Rules.hs
index 4049c3aac..0bbbf3db5 100644
--- a/Duckling/Time/PT/Rules.hs
+++ b/Duckling/Time/PT/Rules.hs
@@ -1143,7 +1143,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/RO/Rules.hs b/Duckling/Time/RO/Rules.hs
index 4e739b518..141f4f168 100644
--- a/Duckling/Time/RO/Rules.hs
+++ b/Duckling/Time/RO/Rules.hs
@@ -905,7 +905,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/RU/Rules.hs b/Duckling/Time/RU/Rules.hs
index 78b29d67a..66f88b8dd 100644
--- a/Duckling/Time/RU/Rules.hs
+++ b/Duckling/Time/RU/Rules.hs
@@ -792,8 +792,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \case
       (token:_) -> do
diff --git a/Duckling/Time/SV/Rules.hs b/Duckling/Time/SV/Rules.hs
index ad6fc6684..99fa56b24 100644
--- a/Duckling/Time/SV/Rules.hs
+++ b/Duckling/Time/SV/Rules.hs
@@ -1258,7 +1258,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $ isIntegerBetween (- 10000) 999
+    [ Predicate $ isIntegerBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/Duckling/Time/TR/Rules.hs b/Duckling/Time/TR/Rules.hs
index a3aec9b80..9995e12c5 100644
--- a/Duckling/Time/TR/Rules.hs
+++ b/Duckling/Time/TR/Rules.hs
@@ -768,8 +768,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \case
       (token:_) -> do
diff --git a/Duckling/Time/UK/Rules.hs b/Duckling/Time/UK/Rules.hs
index a5fc4e1e7..99fb75de6 100644
--- a/Duckling/Time/UK/Rules.hs
+++ b/Duckling/Time/UK/Rules.hs
@@ -746,8 +746,7 @@ ruleYearLatent :: Rule
 ruleYearLatent = Rule
   { name = "year (latent)"
   , pattern =
-    [ Predicate $
-        or . sequence [isIntegerBetween (- 10000) 0, isIntegerBetween 25 999]
+    [ Predicate $ isIntegerBetween 25 999
     ]
   , prod = \tokens -> case tokens of
       (token:_) -> do
diff --git a/tests/Duckling/Time/EN/Tests.hs b/tests/Duckling/Time/EN/Tests.hs
index a70b4d1e4..5512613b1 100644
--- a/tests/Duckling/Time/EN/Tests.hs
+++ b/tests/Duckling/Time/EN/Tests.hs
@@ -180,4 +180,5 @@ rangeTests = testCase "Range Test" $
          , ("at 6pm (PDT) GMT", Range 0 12) -- ruleTimezoneBracket
          , ("6pm GMT - 8pm GMT PDT", Range 0 17)
            -- ruleTimezone will not match because TimeData hasTimezone.
+         , ("Monday - 1", Range 0 6) -- ruleYearLatent to not accept negative years.
          ]

From c6a48a1d0678a389f86d17db2676e1a289e355ce Mon Sep 17 00:00:00 2001
From: Julien Odent <jodent@fb.com>
Date: Sat, 12 Feb 2022 00:05:20 -0800
Subject: [PATCH 5/9] Duration/DE+EN: integer <hours> and <minutes> to accept
 valid minutes

Summary:
* as title
* refactored `numberBetween` to be a `Predicate`

Reviewed By: nishsinghal20

Differential Revision: D34180649

fbshipit-source-id: 8fbe6db83e8b22181bd0bbde533e2d3390d24c75
---
 Duckling/AmountOfMoney/ZH/Rules.hs  |  2 +-
 Duckling/Duration/DE/Rules.hs       |  4 ++--
 Duckling/Duration/EN/Rules.hs       |  4 ++--
 Duckling/Numeral/AF/Rules.hs        |  2 +-
 Duckling/Numeral/AR/Rules.hs        |  6 +++---
 Duckling/Numeral/BG/Rules.hs        |  4 ++--
 Duckling/Numeral/CA/Rules.hs        | 16 +++++++++++-----
 Duckling/Numeral/DA/Rules.hs        |  4 ++--
 Duckling/Numeral/DE/Rules.hs        |  2 +-
 Duckling/Numeral/EL/Rules.hs        |  2 +-
 Duckling/Numeral/EN/Rules.hs        |  2 +-
 Duckling/Numeral/ES/Rules.hs        | 27 +++++++++++++++++----------
 Duckling/Numeral/ET/Rules.hs        |  2 +-
 Duckling/Numeral/FA/Rules.hs        |  4 ++--
 Duckling/Numeral/FR/Rules.hs        |  6 +++---
 Duckling/Numeral/HE/Rules.hs        |  8 ++++----
 Duckling/Numeral/HI/Rules.hs        |  4 ++--
 Duckling/Numeral/HR/Rules.hs        |  8 ++++----
 Duckling/Numeral/Helpers.hs         | 10 ++++------
 Duckling/Numeral/ID/Rules.hs        |  6 +++---
 Duckling/Numeral/IT/Rules.hs        |  6 +++---
 Duckling/Numeral/JA/Rules.hs        | 24 ++++++++++++------------
 Duckling/Numeral/KA/Rules.hs        |  6 +++---
 Duckling/Numeral/MN/Rules.hs        |  2 +-
 Duckling/Numeral/MY/Rules.hs        | 14 +++++++-------
 Duckling/Numeral/NB/Rules.hs        |  2 +-
 Duckling/Numeral/NL/Rules.hs        |  2 +-
 Duckling/Numeral/PL/Rules.hs        |  6 +++---
 Duckling/Numeral/PT/Rules.hs        | 12 ++++++------
 Duckling/Numeral/RO/Rules.hs        |  2 +-
 Duckling/Numeral/RU/Rules.hs        |  4 ++--
 Duckling/Numeral/SK/Rules.hs        |  2 +-
 Duckling/Numeral/SV/Rules.hs        |  2 +-
 Duckling/Numeral/SW/Rules.hs        |  2 +-
 Duckling/Numeral/TH/Rules.hs        |  2 +-
 Duckling/Numeral/TR/Rules.hs        |  2 +-
 Duckling/Numeral/UK/Rules.hs        |  4 ++--
 Duckling/Numeral/VI/Rules.hs        |  2 +-
 Duckling/Numeral/ZH/Rules.hs        |  8 ++++----
 Duckling/Quantity/ZH/Rules.hs       |  2 +-
 tests/Duckling/Duration/EN/Tests.hs | 11 +++++++++++
 41 files changed, 131 insertions(+), 109 deletions(-)

diff --git a/Duckling/AmountOfMoney/ZH/Rules.hs b/Duckling/AmountOfMoney/ZH/Rules.hs
index 12fbae539..6f7568851 100644
--- a/Duckling/AmountOfMoney/ZH/Rules.hs
+++ b/Duckling/AmountOfMoney/ZH/Rules.hs
@@ -226,7 +226,7 @@ ruleOneDollarAnd = Rule
   { name = "one dollar and x dimes (short form)"
   , pattern =
     [ regex "個"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
diff --git a/Duckling/Duration/DE/Rules.hs b/Duckling/Duration/DE/Rules.hs
index 405622dc5..5333d38d1 100644
--- a/Duckling/Duration/DE/Rules.hs
+++ b/Duckling/Duration/DE/Rules.hs
@@ -19,7 +19,7 @@ import Duckling.Regex.Types
 import Control.Monad (join)
 import qualified Data.Text as Text
 import Prelude
-import Duckling.Numeral.Helpers (parseInteger)
+import Duckling.Numeral.Helpers (numberBetween, parseInteger)
 import Duckling.Duration.Types (DurationData(..))
 import qualified Duckling.Duration.Types as TDuration
 import Data.String
@@ -216,7 +216,7 @@ ruleHoursAndMinutes = Rule
   , pattern =
     [ Predicate isNatural
     , regex "(ein(en?) )?stunden?( und)?"
-    , Predicate isNatural
+    , Predicate $ and . sequence [isNatural, numberBetween 1 60]
     , Predicate $ isGrain TG.Minute
     ]
   , prod = \case
diff --git a/Duckling/Duration/EN/Rules.hs b/Duckling/Duration/EN/Rules.hs
index 639b220b5..06b8a2053 100644
--- a/Duckling/Duration/EN/Rules.hs
+++ b/Duckling/Duration/EN/Rules.hs
@@ -20,7 +20,7 @@ import qualified Data.Text as Text
 import Duckling.Dimensions.Types
 import Duckling.Duration.Helpers
 import Duckling.Duration.Types (DurationData(..))
-import Duckling.Numeral.Helpers (parseInteger)
+import Duckling.Numeral.Helpers (numberBetween, parseInteger)
 import Duckling.Numeral.Types (NumeralData(..))
 import Duckling.Regex.Types
 import Duckling.Types
@@ -180,7 +180,7 @@ ruleDurationHoursAndMinutes = Rule
   , pattern =
     [ Predicate isNatural
     , regex "hours?( and)?"
-    , Predicate isNatural
+    , Predicate $ and . sequence [isNatural, numberBetween 1 60]
     ]
   , prod = \case
       (Token Numeral h:
diff --git a/Duckling/Numeral/AF/Rules.hs b/Duckling/Numeral/AF/Rules.hs
index 99bce9dd4..42f29cc28 100644
--- a/Duckling/Numeral/AF/Rules.hs
+++ b/Duckling/Numeral/AF/Rules.hs
@@ -124,7 +124,7 @@ ruleCompositeTens :: Rule
 ruleCompositeTens = Rule
   { name = "integer ([3-9][1-9])"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "en"
     , oneOf [20, 30..90]
     ]
diff --git a/Duckling/Numeral/AR/Rules.hs b/Duckling/Numeral/AR/Rules.hs
index 37e638dbd..35cdaf04e 100644
--- a/Duckling/Numeral/AR/Rules.hs
+++ b/Duckling/Numeral/AR/Rules.hs
@@ -42,7 +42,7 @@ ruleInteger23 = Rule
   , pattern =
     [ oneOf [100, 200 .. 900]
     , regex "و"
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -86,7 +86,7 @@ ruleInteger22 :: Rule
 ruleInteger22 = Rule
   { name = "integer 21..99"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "و"
     , oneOf [20, 30 .. 90]
     ]
@@ -102,7 +102,7 @@ ruleInteger21 :: Rule
 ruleInteger21 = Rule
   { name = "integer (13..19)"
   , pattern =
-    [ numberBetween 3 10
+    [ Predicate $ numberBetween 3 10
     , numberWith TNumeral.value (== 10)
     ]
   , prod = \tokens -> case tokens of
diff --git a/Duckling/Numeral/BG/Rules.hs b/Duckling/Numeral/BG/Rules.hs
index c5383b868..ebfa12e77 100644
--- a/Duckling/Numeral/BG/Rules.hs
+++ b/Duckling/Numeral/BG/Rules.hs
@@ -111,7 +111,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20, 30..90]
     , regex "и"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -147,7 +147,7 @@ ruleCompositeHundreds = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [200, 300..900]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
diff --git a/Duckling/Numeral/CA/Rules.hs b/Duckling/Numeral/CA/Rules.hs
index db6e6104c..9ad3536b3 100644
--- a/Duckling/Numeral/CA/Rules.hs
+++ b/Duckling/Numeral/CA/Rules.hs
@@ -140,7 +140,10 @@ ruleHigherTensWithOnes :: Rule
 ruleHigherTensWithOnes = Rule
   { name = "number (31..39 41..49 51..59 61..69 71..79 81..89 91..99)"
   , pattern =
-      [oneOf [30, 40, 50, 60, 70, 80, 90], regex "-", numberBetween 1 9]
+      [ oneOf [30, 40, 50, 60, 70, 80, 90]
+      , regex "-"
+      , Predicate $ numberBetween 1 9
+      ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:
        _:
@@ -185,7 +188,10 @@ ruleTwenties :: Rule
 ruleTwenties = Rule
   { name = "number (21..29)"
   , pattern =
-      [oneOf [20], regex "(-i-| i )", numberBetween 1 10]
+      [ oneOf [20]
+      , regex "(-i-| i )"
+      , Predicate $ numberBetween 1 10
+      ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:
        _:
@@ -212,10 +218,10 @@ ruleNumerals :: Rule
 ruleNumerals = Rule
   { name = "numbers 200..999"
   , pattern =
-      [ numberBetween 2 10
+      [ Predicate $ numberBetween 2 10
       , regex "-"
       , numberWith TNumeral.value (== 100)
-      , numberBetween 0 100
+      , Predicate $ numberBetween 0 100
       ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -242,7 +248,7 @@ ruleBelowTenWithTwoDigits = Rule
   { name = "integer (0-9) with two digits"
   , pattern =
       [ regex "zero|0"
-      , numberBetween 1 10
+      , Predicate $ numberBetween 1 10
       ]
   , prod = \case
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) -> double v
diff --git a/Duckling/Numeral/DA/Rules.hs b/Duckling/Numeral/DA/Rules.hs
index e60dd886e..6568e71e0 100644
--- a/Duckling/Numeral/DA/Rules.hs
+++ b/Duckling/Numeral/DA/Rules.hs
@@ -87,7 +87,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -170,7 +170,7 @@ ruleNumeralsOg :: Rule
 ruleNumeralsOg = Rule
   { name = "numbers og"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "og"
     , oneOf [70, 20, 60, 50, 40, 90, 30, 80]
     ]
diff --git a/Duckling/Numeral/DE/Rules.hs b/Duckling/Numeral/DE/Rules.hs
index e551aeb3e..ed31f6bae 100644
--- a/Duckling/Numeral/DE/Rules.hs
+++ b/Duckling/Numeral/DE/Rules.hs
@@ -123,7 +123,7 @@ ruleNumeralsUnd :: Rule
 ruleNumeralsUnd = Rule
   { name = "numbers und"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "und"
     , oneOf [20, 30 .. 90]
     ]
diff --git a/Duckling/Numeral/EL/Rules.hs b/Duckling/Numeral/EL/Rules.hs
index 266490a3d..85fd5edbe 100644
--- a/Duckling/Numeral/EL/Rules.hs
+++ b/Duckling/Numeral/EL/Rules.hs
@@ -123,7 +123,7 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
       [ oneOf [20,30..90]
-      , numberBetween 1 10
+      , Predicate $ numberBetween 1 10
       ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens} :
diff --git a/Duckling/Numeral/EN/Rules.hs b/Duckling/Numeral/EN/Rules.hs
index a328184d4..4422458b5 100644
--- a/Duckling/Numeral/EN/Rules.hs
+++ b/Duckling/Numeral/EN/Rules.hs
@@ -161,7 +161,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20,30..90]
     , regex "[\\s\\-]+"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
diff --git a/Duckling/Numeral/ES/Rules.hs b/Duckling/Numeral/ES/Rules.hs
index 636845b8b..8638a4a14 100644
--- a/Duckling/Numeral/ES/Rules.hs
+++ b/Duckling/Numeral/ES/Rules.hs
@@ -69,9 +69,8 @@ ruleBelowTenWithTwoDigits = Rule
   {
     name = "integer (0-9) with two digits"
   , pattern =
-      [
-        regex "((c|z)ero)|0"
-      , numberBetween 1 10
+      [ regex "((c|z)ero)|0"
+      , Predicate $ numberBetween 1 10
       ]
   , prod = \case
       (
@@ -124,12 +123,17 @@ ruleNumeralSixteenToTwentyNine = Rule
 ruleNumeralSixteenToNineteenWithDiez :: Rule
 ruleNumeralSixteenToNineteenWithDiez = Rule
   { name = "number (16..19, two words)"
-  , pattern = [numberWith TNumeral.value (== 10), regex "y", numberBetween 6 10]
+  , pattern =
+      [ numberWith TNumeral.value (== 10)
+      , regex "y"
+      , Predicate $ numberBetween 6 10
+      ]
   , prod = \case
       (_ : _ : Token Numeral NumeralData { TNumeral.value = v } : _) ->
         double $ 10 + v
       _ -> Nothing
   }
+
 byTensMap :: HashMap.HashMap Text.Text Integer
 byTensMap =
   HashMap.fromList
@@ -161,7 +165,10 @@ ruleNumeralTwentyOneToNinetyNine :: Rule
 ruleNumeralTwentyOneToNinetyNine = Rule
   { name = "number (21..29 31..39 41..49 51..59 61..69 71..79 81..89 91..99)"
   , pattern =
-      [oneOf [20, 30 .. 90], regex "y", numberBetween 1 10]
+      [ oneOf [20, 30 .. 90]
+      , regex "y"
+      , Predicate $ numberBetween 1 10
+      ]
   , prod = \case
       (Token Numeral NumeralData { TNumeral.value = v1 } : _ : Token Numeral NumeralData { TNumeral.value = v2 } : _) ->
         double $ v1 + v2
@@ -221,7 +228,7 @@ ruleTwoPartHundreds :: Rule
 ruleTwoPartHundreds = Rule
  { name = "2..9 cientos"
  , pattern =
-     [ numberBetween 2 10
+     [ Predicate $ numberBetween 2 10
      , regex "cientos"
      ]
   , prod = \case
@@ -235,7 +242,7 @@ ruleNumeralHundredsAndSmaller = Rule
   { name = "<hundreds> 0..99"
   , pattern =
       [ numberWith TNumeral.value (TNumeral.isMultiple 100)
-      , numberBetween 0 100
+      , Predicate $ numberBetween 0 100
       ]
   , prod = \case
       (Token Numeral NumeralData { TNumeral.value = v1 } : Token Numeral NumeralData { TNumeral.value = v2 } : _)
@@ -247,7 +254,7 @@ ruleNumeralMultiply :: Rule
 ruleNumeralMultiply = Rule
   { name = "2..999 <multipliable>"
   , pattern =
-      [ numberBetween 2 1000
+      [ Predicate $ numberBetween 2 1000
       , Predicate isMultipliable
       ]
   , prod = \case
@@ -261,7 +268,7 @@ ruleNumeralThousandsAnd = Rule
   { name = "<thousands> 0..999"
   , pattern =
       [ numberWith TNumeral.value (TNumeral.isMultiple 1000)
-      , numberBetween 0 999
+      , Predicate $ numberBetween 0 999
       ]
   , prod = \case
       (Token Numeral NumeralData { TNumeral.value = v1 } : Token Numeral NumeralData { TNumeral.value = v2 } : _)
@@ -274,7 +281,7 @@ ruleNumeralMillionsAnd = Rule
   { name = "<millions> 0..999999"
   , pattern =
       [ numberWith TNumeral.value (TNumeral.isMultiple 1000000)
-      , numberBetween 0 999999
+      , Predicate $ numberBetween 0 999999
       ]
   , prod = \case
       (Token Numeral NumeralData { TNumeral.value = v1 } : Token Numeral NumeralData { TNumeral.value = v2 } : _)
diff --git a/Duckling/Numeral/ET/Rules.hs b/Duckling/Numeral/ET/Rules.hs
index 51ac86d91..3deb0b11e 100644
--- a/Duckling/Numeral/ET/Rules.hs
+++ b/Duckling/Numeral/ET/Rules.hs
@@ -87,7 +87,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/FA/Rules.hs b/Duckling/Numeral/FA/Rules.hs
index 1e08cbeb3..f58d9d246 100644
--- a/Duckling/Numeral/FA/Rules.hs
+++ b/Duckling/Numeral/FA/Rules.hs
@@ -135,7 +135,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20,30..90]
     , regex "و"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -151,7 +151,7 @@ ruleCompositeHundred = Rule
   , pattern =
     [ oneOf [100,200..900]
     , regex "و"
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
diff --git a/Duckling/Numeral/FR/Rules.hs b/Duckling/Numeral/FR/Rules.hs
index 5c8a1d840..6529af5c3 100644
--- a/Duckling/Numeral/FR/Rules.hs
+++ b/Duckling/Numeral/FR/Rules.hs
@@ -57,7 +57,7 @@ ruleNumerals2 = Rule
   , pattern =
     [ oneOf [20, 50, 40, 30]
     , regex "[\\s\\-]+"
-    , numberBetween 2 10
+    , Predicate $ numberBetween 2 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -119,7 +119,7 @@ ruleNumerals5 = Rule
   , pattern =
     [ oneOf [60, 80]
     , regex "[\\s\\-]+"
-    , numberBetween 2 20
+    , Predicate $ numberBetween 2 20
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -170,7 +170,7 @@ ruleNumeral3 = Rule
   , pattern =
     [ numberWith TNumeral.value (== 10)
     , regex "[\\s\\-]+"
-    , numberBetween 7 10
+    , Predicate $ numberBetween 7 10
     ]
   , prod = \tokens -> case tokens of
       (_:
diff --git a/Duckling/Numeral/HE/Rules.hs b/Duckling/Numeral/HE/Rules.hs
index c213cc18c..87a8d07f7 100644
--- a/Duckling/Numeral/HE/Rules.hs
+++ b/Duckling/Numeral/HE/Rules.hs
@@ -68,7 +68,7 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [ 20, 30..90 ]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -83,7 +83,7 @@ ruleCompositeTensWithAnd = Rule
   , pattern =
     [ oneOf [ 20, 30..90 ]
     , regex "ו"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -230,7 +230,7 @@ ruleInteger14 :: Rule
 ruleInteger14 = Rule
   { name = "integer 11..19"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , numberWith TNumeral.value (== 10)
     ]
   , prod = \tokens -> case tokens of
@@ -263,7 +263,7 @@ ruleInteger16 = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [300, 600, 500, 100, 800, 200, 900, 700, 400]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/HI/Rules.hs b/Duckling/Numeral/HI/Rules.hs
index 3c20e888d..d3a7bdc3d 100644
--- a/Duckling/Numeral/HI/Rules.hs
+++ b/Duckling/Numeral/HI/Rules.hs
@@ -222,7 +222,7 @@ ruleCompositeHundreds = Rule
   , pattern =
     [ oneOf [100,200..5000]
     , regex "[\\s\\-]+"
-    , numberBetween 1 99
+    , Predicate $ numberBetween 1 99
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
@@ -239,7 +239,7 @@ ruleCompositeThousands = Rule
   , pattern =
     [ oneOf [1000,2000..50000]
     , regex "[\\s\\-]+"
-    , numberBetween 1 999
+    , Predicate $ numberBetween 1 999
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = thousands}:
diff --git a/Duckling/Numeral/HR/Rules.hs b/Duckling/Numeral/HR/Rules.hs
index e854d6196..2bb039e5b 100644
--- a/Duckling/Numeral/HR/Rules.hs
+++ b/Duckling/Numeral/HR/Rules.hs
@@ -143,7 +143,7 @@ ruleNumbersI = Rule
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
     , regex "i"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -255,7 +255,7 @@ ruleInteger4 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -290,9 +290,9 @@ ruleNumbers :: Rule
 ruleNumbers = Rule
   { name = "numbers 100..999"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , numberWith TNumeral.value (== 100)
-    , numberBetween 0 100
+    , Predicate $ numberBetween 0 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/Helpers.hs b/Duckling/Numeral/Helpers.hs
index 6c1da0408..b6d834db6 100644
--- a/Duckling/Numeral/Helpers.hs
+++ b/Duckling/Numeral/Helpers.hs
@@ -101,12 +101,10 @@ numberWith f pred = Predicate $ \x ->
     (Token Numeral x@NumeralData{}) -> pred (f x)
     _ -> False
 
-numberBetween :: Double -> Double -> PatternItem
-numberBetween low up = Predicate $ \x ->
-  case x of
-    (Token Numeral NumeralData {value = v, multipliable = False}) ->
-      low <= v && v < up
-    _ -> False
+numberBetween :: Double -> Double -> Predicate
+numberBetween low up (Token Numeral NumeralData {value = v, multipliable = False}) =
+  low <= v && v < up
+numberBetween _ _ _ = False
 
 isNatural :: Predicate
 isNatural (Token Numeral NumeralData {value = v}) =
diff --git a/Duckling/Numeral/ID/Rules.hs b/Duckling/Numeral/ID/Rules.hs
index 4878065da..3f6c09c9e 100644
--- a/Duckling/Numeral/ID/Rules.hs
+++ b/Duckling/Numeral/ID/Rules.hs
@@ -47,7 +47,7 @@ ruleTeen :: Rule
 ruleTeen = Rule
   { name = "teen"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "belas"
     ]
   , prod = \tokens -> case tokens of
@@ -132,7 +132,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -222,7 +222,7 @@ ruleInteger2 :: Rule
 ruleInteger2 = Rule
   { name = "integer 20..90"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , numberWith TNumeral.value (== 10)
     ]
   , prod = \tokens -> case tokens of
diff --git a/Duckling/Numeral/IT/Rules.hs b/Duckling/Numeral/IT/Rules.hs
index 2e2194ade..1bf989935 100644
--- a/Duckling/Numeral/IT/Rules.hs
+++ b/Duckling/Numeral/IT/Rules.hs
@@ -159,7 +159,7 @@ ruleNumeral3 = Rule
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
     , regex "e"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -287,9 +287,9 @@ ruleNumerals :: Rule
 ruleNumerals = Rule
   { name = "numbers 200..999"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , numberWith TNumeral.value (== 100)
-    , numberBetween 0 100
+    , Predicate $ numberBetween 0 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/JA/Rules.hs b/Duckling/Numeral/JA/Rules.hs
index 1acb0217f..76b8fd2f4 100644
--- a/Duckling/Numeral/JA/Rules.hs
+++ b/Duckling/Numeral/JA/Rules.hs
@@ -52,7 +52,7 @@ ruleInteger10 = Rule
   { name = "integer (1000..1999)"
   , pattern =
     [ regex "千"
-    , numberBetween 1 1000
+    , Predicate $ numberBetween 1 1000
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
@@ -76,7 +76,7 @@ ruleInteger15 :: Rule
 ruleInteger15 = Rule
   { name = "integer (20000..90000)"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "万"
     ]
   , prod = \tokens -> case tokens of
@@ -111,7 +111,7 @@ ruleInteger3 :: Rule
 ruleInteger3 = Rule
   { name = "integer (20..90)"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "十"
     ]
   , prod = \tokens -> case tokens of
@@ -133,7 +133,7 @@ ruleInteger6 = Rule
   { name = "integer (100..199)"
   , pattern =
     [ regex "百"
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) -> double $ v + 100
@@ -145,7 +145,7 @@ ruleInteger12 = Rule
   { name = "integer 2001..9999"
   , pattern =
     [ oneOf [3000, 9000, 7000, 8000, 2000, 4000, 6000, 5000]
-    , numberBetween 1 1000
+    , Predicate $ numberBetween 1 1000
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -178,7 +178,7 @@ ruleInteger7 :: Rule
 ruleInteger7 = Rule
   { name = "integer (200..900)"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "百"
     ]
   , prod = \tokens -> case tokens of
@@ -191,7 +191,7 @@ ruleInteger14 = Rule
   { name = "integer (10000..19999)"
   , pattern =
     [ regex "万"
-    , numberBetween 1 10000
+    , Predicate $ numberBetween 1 10000
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
@@ -204,7 +204,7 @@ ruleInteger8 = Rule
   { name = "integer 201..999"
   , pattern =
     [ oneOf [300, 600, 500, 800, 200, 900, 700, 400]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -218,7 +218,7 @@ ruleInteger16 = Rule
   { name = "integer 20001..99999"
   , pattern =
     [ oneOf [20000, 40000, 80000, 60000, 30000, 70000, 90000, 50000]
-    , numberBetween 1 10000
+    , Predicate $ numberBetween 1 10000
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -269,7 +269,7 @@ ruleInteger4 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -283,7 +283,7 @@ ruleInteger2 = Rule
   { name = "integer (11..19)"
   , pattern =
     [ regex "十"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) -> double $ v + 10
@@ -294,7 +294,7 @@ ruleInteger11 :: Rule
 ruleInteger11 = Rule
   { name = "integer (2000..9000)"
   , pattern =
-    [ numberBetween 2 10
+    [ Predicate $ numberBetween 2 10
     , regex "千"
     ]
   , prod = \tokens -> case tokens of
diff --git a/Duckling/Numeral/KA/Rules.hs b/Duckling/Numeral/KA/Rules.hs
index a079ef8e1..d0d3276d4 100644
--- a/Duckling/Numeral/KA/Rules.hs
+++ b/Duckling/Numeral/KA/Rules.hs
@@ -209,7 +209,7 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20,40..90]
-    , numberBetween 1 20
+    , Predicate $ numberBetween 1 20
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -224,7 +224,7 @@ ruleCompositeHundreds = Rule
   , pattern =
     [ oneOf [100,200..900]
     , oneOf [20,40..90]
-    , numberBetween 1 20
+    , Predicate $ numberBetween 1 20
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
@@ -239,7 +239,7 @@ ruleCompositeHundredsAndUnits = Rule
   { name = "integer 100..999"
   , pattern =
     [ oneOf [100,200..900]
-    , numberBetween 1 20
+    , Predicate $ numberBetween 1 20
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
diff --git a/Duckling/Numeral/MN/Rules.hs b/Duckling/Numeral/MN/Rules.hs
index afe92267a..397795c19 100644
--- a/Duckling/Numeral/MN/Rules.hs
+++ b/Duckling/Numeral/MN/Rules.hs
@@ -112,7 +112,7 @@ ruleNumeralsUnd = Rule
   { name = "numbers und"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/MY/Rules.hs b/Duckling/Numeral/MY/Rules.hs
index 5bed84f82..bc041152d 100644
--- a/Duckling/Numeral/MY/Rules.hs
+++ b/Duckling/Numeral/MY/Rules.hs
@@ -29,9 +29,9 @@ ruleInteger5 :: Rule
 ruleInteger5 = Rule
   { name = "integer (11..99) "
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "ဆယ့်"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -72,7 +72,7 @@ ruleInteger3 = Rule
   { name = "integer (11..19) "
   , pattern =
     [ regex "ဆယ့်"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (_:Token Numeral NumeralData{TNumeral.value = v}:_) -> double $ v + 10
@@ -102,7 +102,7 @@ ruleInteger6 :: Rule
 ruleInteger6 = Rule
   { name = "integer (100..900)"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "ရာ"
     ]
   , prod = \tokens -> case tokens of
@@ -114,7 +114,7 @@ ruleInteger7 :: Rule
 ruleInteger7 = Rule
   { name = "integer (1000..9000)"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "ထောင်"
     ]
   , prod = \tokens -> case tokens of
@@ -126,7 +126,7 @@ ruleInteger8 :: Rule
 ruleInteger8 = Rule
   { name = "integer (10000..90000)"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "သောင်း"
     ]
   , prod = \tokens -> case tokens of
@@ -147,7 +147,7 @@ ruleInteger4 :: Rule
 ruleInteger4 = Rule
   { name = "integer (10..90)"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "ဆယ်"
     ]
   , prod = \tokens -> case tokens of
diff --git a/Duckling/Numeral/NB/Rules.hs b/Duckling/Numeral/NB/Rules.hs
index 70663b245..8f2fc71ba 100644
--- a/Duckling/Numeral/NB/Rules.hs
+++ b/Duckling/Numeral/NB/Rules.hs
@@ -107,7 +107,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/NL/Rules.hs b/Duckling/Numeral/NL/Rules.hs
index 76e1314a8..927447334 100644
--- a/Duckling/Numeral/NL/Rules.hs
+++ b/Duckling/Numeral/NL/Rules.hs
@@ -146,7 +146,7 @@ ruleNumeralsEn :: Rule
 ruleNumeralsEn = Rule
   { name = "numbers en"
   , pattern =
-    [ numberBetween 1 10
+    [ Predicate $ numberBetween 1 10
     , regex "-?en-?"
     , oneOf [20, 30 .. 90]
     ]
diff --git a/Duckling/Numeral/PL/Rules.hs b/Duckling/Numeral/PL/Rules.hs
index 74935e415..ac3321845 100644
--- a/Duckling/Numeral/PL/Rules.hs
+++ b/Duckling/Numeral/PL/Rules.hs
@@ -137,8 +137,8 @@ ruleSpecialCompositionForMissingHundredsLikeInOneTwentyTwo :: Rule
 ruleSpecialCompositionForMissingHundredsLikeInOneTwentyTwo = Rule
   { name = "special composition for missing hundreds like in one twenty two"
   , pattern =
-    [ numberBetween 1 10
-    , numberBetween 10 100
+    [ Predicate $ numberBetween 1 10
+    , Predicate $ numberBetween 10 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -516,7 +516,7 @@ ruleInteger2 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/PT/Rules.hs b/Duckling/Numeral/PT/Rules.hs
index abcb72e1d..cf6906057 100644
--- a/Duckling/Numeral/PT/Rules.hs
+++ b/Duckling/Numeral/PT/Rules.hs
@@ -173,7 +173,7 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20,30..90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -188,7 +188,7 @@ ruleDecsAnd = Rule
   , pattern =
     [ oneOf [20, 30..90]
     , regex "e"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -203,7 +203,7 @@ ruleCompositeCents = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [100, 200..900]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
@@ -218,7 +218,7 @@ ruleCentsAnd = Rule
   , pattern =
     [ oneOf [100, 200..900]
     , regex "e"
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -232,8 +232,8 @@ ruleSkipHundreds :: Rule
 ruleSkipHundreds = Rule
   { name = "one twenty two"
   , pattern =
-    [ numberBetween 1 10
-    , numberBetween 10 100
+    [ Predicate $ numberBetween 1 10
+    , Predicate $ numberBetween 10 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = hundreds}:
diff --git a/Duckling/Numeral/RO/Rules.hs b/Duckling/Numeral/RO/Rules.hs
index b93896bb0..9c2765565 100644
--- a/Duckling/Numeral/RO/Rules.hs
+++ b/Duckling/Numeral/RO/Rules.hs
@@ -69,7 +69,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/RU/Rules.hs b/Duckling/Numeral/RU/Rules.hs
index d196f8357..ab516c9f1 100644
--- a/Duckling/Numeral/RU/Rules.hs
+++ b/Duckling/Numeral/RU/Rules.hs
@@ -179,7 +179,7 @@ ruleInteger7 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -193,7 +193,7 @@ ruleInteger8 = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [300, 600, 500, 100, 800, 200, 900, 700, 400]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/SK/Rules.hs b/Duckling/Numeral/SK/Rules.hs
index 2e2068f2e..327234dfb 100644
--- a/Duckling/Numeral/SK/Rules.hs
+++ b/Duckling/Numeral/SK/Rules.hs
@@ -98,7 +98,7 @@ ruleIntegerCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30..90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = tens}:
diff --git a/Duckling/Numeral/SV/Rules.hs b/Duckling/Numeral/SV/Rules.hs
index fc9612e6e..182ec7ba5 100644
--- a/Duckling/Numeral/SV/Rules.hs
+++ b/Duckling/Numeral/SV/Rules.hs
@@ -96,7 +96,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/SW/Rules.hs b/Duckling/Numeral/SW/Rules.hs
index 16f5df5ca..df533441a 100644
--- a/Duckling/Numeral/SW/Rules.hs
+++ b/Duckling/Numeral/SW/Rules.hs
@@ -87,7 +87,7 @@ ruleCompositeTens = Rule
   { name = "integer 11..19 21..29 .. 91..99"
   , pattern = [oneOf [20,30..90]
   , regex "-?na-?"
-  , numberBetween 1 10]
+  , Predicate $ numberBetween 1 10]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
        Token Numeral NumeralData{TNumeral.value = v2}:
diff --git a/Duckling/Numeral/TH/Rules.hs b/Duckling/Numeral/TH/Rules.hs
index 0d8c14e1d..1c8c321ea 100644
--- a/Duckling/Numeral/TH/Rules.hs
+++ b/Duckling/Numeral/TH/Rules.hs
@@ -246,7 +246,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20,30..90]
     , regex "[\\s\\-]+"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
       (Token Numeral NumeralData{TNumeral.value = tens}:
diff --git a/Duckling/Numeral/TR/Rules.hs b/Duckling/Numeral/TR/Rules.hs
index 8aa98ad3a..5bbf715bd 100644
--- a/Duckling/Numeral/TR/Rules.hs
+++ b/Duckling/Numeral/TR/Rules.hs
@@ -607,7 +607,7 @@ ruleInteger4 = Rule
   { name = "integer 11..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 10, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/UK/Rules.hs b/Duckling/Numeral/UK/Rules.hs
index 03bbb3935..6bde60551 100644
--- a/Duckling/Numeral/UK/Rules.hs
+++ b/Duckling/Numeral/UK/Rules.hs
@@ -145,7 +145,7 @@ ruleInteger7 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [70, 20, 60, 50, 40, 90, 30, 80]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
@@ -159,7 +159,7 @@ ruleInteger8 = Rule
   { name = "integer 101..999"
   , pattern =
     [ oneOf [300, 600, 500, 100, 800, 200, 900, 700, 400]
-    , numberBetween 1 100
+    , Predicate $ numberBetween 1 100
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/VI/Rules.hs b/Duckling/Numeral/VI/Rules.hs
index 9241261f6..e5fc154a1 100644
--- a/Duckling/Numeral/VI/Rules.hs
+++ b/Duckling/Numeral/VI/Rules.hs
@@ -101,7 +101,7 @@ ruleInteger3 = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20, 30 .. 90]
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
diff --git a/Duckling/Numeral/ZH/Rules.hs b/Duckling/Numeral/ZH/Rules.hs
index bffb23fe3..5d554d426 100644
--- a/Duckling/Numeral/ZH/Rules.hs
+++ b/Duckling/Numeral/ZH/Rules.hs
@@ -92,7 +92,7 @@ ruleCompositeTens = Rule
   , pattern =
     [ oneOf [20,30,40]
     , regex "[\\s\\-]+"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
@@ -324,7 +324,7 @@ ruleHundredPrefix = Rule
   { name = "one hundred and <integer> (short form)"
   , pattern =
     [ regex "百|佰"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
     (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
@@ -337,7 +337,7 @@ ruleThousandPrefix = Rule
   { name = "one thousand and <integer> (short form)"
   , pattern =
     [ regex "千|仟"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
     (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
@@ -350,7 +350,7 @@ ruleTenThousandPrefix = Rule
   { name = "ten thousand and <integer> (short form)"
   , pattern =
     [ regex "万|萬"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     ]
   , prod = \case
     (_:Token Numeral NumeralData{TNumeral.value = v}:_) ->
diff --git a/Duckling/Quantity/ZH/Rules.hs b/Duckling/Quantity/ZH/Rules.hs
index f3ab2df91..e92182ced 100644
--- a/Duckling/Quantity/ZH/Rules.hs
+++ b/Duckling/Quantity/ZH/Rules.hs
@@ -72,7 +72,7 @@ ruleCattyTael = Rule
   , pattern =
     [ Predicate isPositive
     , regex "斤"
-    , numberBetween 1 10
+    , Predicate $ numberBetween 1 10
     , regex "两|兩"
     ]
   , prod = \case
diff --git a/tests/Duckling/Duration/EN/Tests.hs b/tests/Duckling/Duration/EN/Tests.hs
index 05b5a3beb..2edd0924d 100644
--- a/tests/Duckling/Duration/EN/Tests.hs
+++ b/tests/Duckling/Duration/EN/Tests.hs
@@ -12,13 +12,24 @@ module Duckling.Duration.EN.Tests
 import Prelude
 import Data.String
 import Test.Tasty
+import Test.Tasty.HUnit
 
 import Duckling.Dimensions.Types
 import Duckling.Duration.EN.Corpus
 import Duckling.Testing.Asserts
+import Duckling.Testing.Types hiding (examples)
+import Duckling.Types (Range(..))
 
 tests :: TestTree
 tests = testGroup "EN Tests"
   [ makeCorpusTest [Seal Duration] corpus
   , makeNegativeCorpusTest [Seal Duration] negativeCorpus
+  , rangeTests
   ]
+
+rangeTests :: TestTree
+rangeTests = testCase "Range Test" $
+  mapM_ (analyzedRangeTest testContext testOptions . withTargets [Seal Duration]) xs
+  where
+    xs = [ ("1 hour 111565513", Range 0 6) -- ruleDurationHoursAndMinutes to accept valid minutes
+         ]

From ea8a4f6d3b5bac8ffed1ee339126c2fdb375ded5 Mon Sep 17 00:00:00 2001
From: Patrick Werner <boon.werner@gmail.com>
Date: Wed, 16 Feb 2022 09:40:34 -0800
Subject: [PATCH 6/9] Numeral/DE: fix eine not being recognized (#684)

Summary:
Numbers like "eine million" "eine milliarde" were not recognized correctly.

Pull Request resolved: https://github.com/facebook/duckling/pull/684

Reviewed By: girifb

Differential Revision: D34274203

Pulled By: stroxler

fbshipit-source-id: 2a9018799972d110a9c99d777c622e136566dbe9
---
 Duckling/Numeral/DE/Corpus.hs | 3 ++-
 Duckling/Numeral/DE/Rules.hs  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Duckling/Numeral/DE/Corpus.hs b/Duckling/Numeral/DE/Corpus.hs
index be6e2d3a7..b051b9350 100644
--- a/Duckling/Numeral/DE/Corpus.hs
+++ b/Duckling/Numeral/DE/Corpus.hs
@@ -140,6 +140,7 @@ allExamples = concat
              [ "1.416,15"
              ]
   , examples (NumeralValue 1000000.0)
-             [ "1.000.000,00"
+             [ "1.000.000,00",
+               "eine million"
              ]
   ]
diff --git a/Duckling/Numeral/DE/Rules.hs b/Duckling/Numeral/DE/Rules.hs
index ed31f6bae..1a2ce59c6 100644
--- a/Duckling/Numeral/DE/Rules.hs
+++ b/Duckling/Numeral/DE/Rules.hs
@@ -255,7 +255,7 @@ ruleZeroToNineteen :: Rule
 ruleZeroToNineteen = Rule
   { name = "integer (0..19)"
   , pattern =
-    [ regex "(keine[rn]|keine?s?|null|nichts|eins?(er)?|zwei|dreizehn|drei|vierzehn|vier|fünfzehn|fünf|sechzehn|sechs|siebzehn|sieben|achtzehn|acht|neunzehn|neun|elf|zwölf)"
+    [ regex "(keine[rn]|keine?s?|null|nichts|eins?(er?)?|zwei|dreizehn|drei|vierzehn|vier|fünfzehn|fünf|sechzehn|sechs|siebzehn|sieben|achtzehn|acht|neunzehn|neun|elf|zwölf)"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) ->

From 578f4b31cd501af65d22995770a5c160e11eda21 Mon Sep 17 00:00:00 2001
From: Patrick Werner <boonto@users.noreply.github.com>
Date: Thu, 17 Feb 2022 11:04:59 -0800
Subject: [PATCH 7/9] Numeral/DE: add very large german numbers (#682)

Summary: Pull Request resolved: https://github.com/facebook/duckling/pull/682

Test Plan:
CI tests look clean.

As for the German language, I got a friend to double check and the code + test case look good (see Github comment)

Reviewed By: girifb

Differential Revision: D34248572

Pulled By: stroxler

fbshipit-source-id: a031a07808f9aaab142aa365d012035e277676ca
---
 Duckling/Numeral/DE/Corpus.hs |  3 +++
 Duckling/Numeral/DE/Rules.hs  | 22 ++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Duckling/Numeral/DE/Corpus.hs b/Duckling/Numeral/DE/Corpus.hs
index b051b9350..4149ccd5d 100644
--- a/Duckling/Numeral/DE/Corpus.hs
+++ b/Duckling/Numeral/DE/Corpus.hs
@@ -143,4 +143,7 @@ allExamples = concat
              [ "1.000.000,00",
                "eine million"
              ]
+  , examples (NumeralValue 2771090092000000.0)
+             [ "zwei billiarden sieben hundert ein und siebzig billionen neunzig milliarden zwei und neunzig millionen"
+             ]
   ]
diff --git a/Duckling/Numeral/DE/Rules.hs b/Duckling/Numeral/DE/Rules.hs
index 1a2ce59c6..93581e76f 100644
--- a/Duckling/Numeral/DE/Rules.hs
+++ b/Duckling/Numeral/DE/Rules.hs
@@ -201,17 +201,23 @@ rulePowersOfTen :: Rule
 rulePowersOfTen = Rule
   { name = "powers of tens"
   , pattern =
-    [ regex "(hunderte?|tausende?|million(en)?)"
+    [ regex "(hunderte?|tausende?|million(en)?|milliarde(n)?|billion(en)?|billiarde(n)?)"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) -> case Text.toLower match of
-        "hundert"   -> double 1e2 >>= withGrain 2 >>= withMultipliable
-        "hunderte"  -> double 1e2 >>= withGrain 2 >>= withMultipliable
-        "tausend"   -> double 1e3 >>= withGrain 3 >>= withMultipliable
-        "tausende"  -> double 1e3 >>= withGrain 3 >>= withMultipliable
-        "million"   -> double 1e6 >>= withGrain 6 >>= withMultipliable
-        "millionen" -> double 1e6 >>= withGrain 6 >>= withMultipliable
-        _           -> Nothing
+        "hundert"    -> double 1e2  >>= withGrain 2  >>= withMultipliable
+        "hunderte"   -> double 1e2  >>= withGrain 2  >>= withMultipliable
+        "tausend"    -> double 1e3  >>= withGrain 3  >>= withMultipliable
+        "tausende"   -> double 1e3  >>= withGrain 3  >>= withMultipliable
+        "million"    -> double 1e6  >>= withGrain 6  >>= withMultipliable
+        "millionen"  -> double 1e6  >>= withGrain 6  >>= withMultipliable
+        "milliarde"  -> double 1e9  >>= withGrain 9  >>= withMultipliable
+        "milliarden" -> double 1e9  >>= withGrain 9  >>= withMultipliable
+        "billion"    -> double 1e12 >>= withGrain 12 >>= withMultipliable
+        "billionen"  -> double 1e12 >>= withGrain 12 >>= withMultipliable
+        "billiarde"  -> double 1e15 >>= withGrain 15 >>= withMultipliable
+        "billiarden" -> double 1e15 >>= withGrain 15 >>= withMultipliable
+        _            -> Nothing
       _ -> Nothing
   }
 

From 881d189d4b3e44baa246053d48acd23b08f56d5f Mon Sep 17 00:00:00 2001
From: Dmitry Vinnik <dmitryvinn@users.noreply.github.com>
Date: Fri, 4 Mar 2022 19:18:57 -0800
Subject: [PATCH 8/9] docs: add GH button in support of Ukraine (#687)

Summary:
Our mission at Meta Open Source is to empower communities through open source, and we believe that it means building a welcoming and safe environment for all. As a part of this work, we are adding this banner in support for Ukraine during this crisis.

Pull Request resolved: https://github.com/facebook/duckling/pull/687

Reviewed By: haoxuany

Differential Revision: D34630898

Pulled By: dmitryvinn-fb

fbshipit-source-id: 0b8a20d4eb2357319e021ee23e29460e80d0dbbc
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 18bd354a2..47be130d3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Duckling Logo](https://github.com/facebook/duckling/raw/main/logo.png)
 
-# Duckling [![Build Status](https://travis-ci.org/facebook/duckling.svg?branch=master)](https://travis-ci.org/facebook/duckling)
+# Duckling [![Support Ukraine](https://img.shields.io/badge/Support-Ukraine-FFD500?style=flat&labelColor=005BBB)](https://opensource.fb.com/support-ukraine) [![Build Status](https://travis-ci.org/facebook/duckling.svg?branch=master)](https://travis-ci.org/facebook/duckling)
 
 Duckling is a Haskell library that parses text into structured data.
 

From 1faab00741b189b8ae985774b965adfd6e88cdc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= <develop@fuchss.org>
Date: Mon, 7 Mar 2022 16:48:15 -0800
Subject: [PATCH 9/9] Update Dockerfile to resolve #671 (#685)

Summary:
Applied fix mentioned in https://github.com/facebook/duckling/issues/671 to resolve https://github.com/facebook/duckling/issues/671

Since, no PR to fix this is present, I simply open a PR with the suggestion of AbstractUmbra.
The suggested fix seems to work (Docker Image builds and is operational)

Pull Request resolved: https://github.com/facebook/duckling/pull/685

Test Plan:
The author verified that the docker image works - it was missing some dependencies before.

There's no way to test this in sigma, but the change makes sense.

Reviewed By: haoxuany

Differential Revision: D34697708

Pulled By: stroxler

fbshipit-source-id: 2731604e136acfd74d4eedf3bf309f79894bb981
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7027a5857..4aa7479c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM haskell:8-buster AS builder
 
 RUN apt-get update -qq && \
-  apt-get install -qq -y libpcre3 libpcre3-dev build-essential --fix-missing --no-install-recommends && \
+  apt-get install -qq -y libpcre3 libpcre3-dev build-essential pkg-config --fix-missing --no-install-recommends && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*